From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6864480010557718528 X-Received: by 2002:a5d:4152:: with SMTP id c18mr9104661wrq.277.1599073392813; Wed, 02 Sep 2020 12:03:12 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:8:: with SMTP id h8ls3842949wrx.3.gmail; Wed, 02 Sep 2020 12:03:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJygC+rgMl/Fj3cCj25ZrtX83++UlvqDUE3mzBcgXbVF3gZsoydPzDaXyLh9V8SAOTdfRy1S X-Received: by 2002:adf:a193:: with SMTP id u19mr2956941wru.374.1599073392031; Wed, 02 Sep 2020 12:03:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599073392; cv=none; d=google.com; s=arc-20160816; b=DIPcvmdhMrMqoiYQ5YMylUU9tACGgEUKpZBjUw1GWTfQeCdt1BaCkxLRssobvwCWwD HuqF7IDSGZpVMlz6Bo4vgBv1GgvBtfIjFSr84b0QOhUxLp2PcJnKhkCXkfDPlUgbPhZL y6g4dKgKSUduGzW2j2XBnEqZ9AB7nAvq8CaEtzgQmnZ6yMlbB0jo8DB9DbgvFAnXbb3E iXOBKEiLVbjUYasXGPK/3j+9bdFbM3CasJALYaWu9Kr2ZsJEsrkaw+gSV7NozSPiXhTb VXKrrpAMJhz3joQEcHfwNFg/MVQuvX3kDkWQ6L7PtmLaFhZAXOK4rSeiygFuN3hXaRs0 Zl2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:to:from :ironport-sdr:ironport-sdr; bh=er496ge8BiZaHq+RN2JhQ07abxKFrgSKmA93F+3Baf4=; b=iDqyMaUGrCUo7/9xndktx+j1KuSdh0jyBPgw+ruMQ7vs25U4mcskOD0ri6Lc0vikYb SaLrpTA9V5Etj0gmD+u+TUPmVIR2Hl3PppMI8kvvK7FwAfPE5lbWTnLglrB1sZsBWWTo UONEZFX7k9Sd35cWofiymm2vqJ/KLCzmkWLnu9LcyfpGB2KxigXLGGBz1lXHem4kRbul rOVeQabtAuGvQxMemtDDL8XRp5t0ewTB8Ip5rocN1snMdMuYw0Q/MiwvyvuuO0RIVa7d zf7uOhzyWnA/54iT36SLyVIHVoP/EqKG8q6z738R28Y9W2PaDtAjr3raAz4C/DptvSLo 1/yQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com. [68.232.137.180]) by gmr-mx.google.com with ESMTPS id w6si20912wmk.2.2020.09.02.12.03.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Sep 2020 12:03:12 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) client-ip=68.232.137.180; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: zqrHCqypeZO1yrCg8ElB9EsnrtcgEv2OB2SAMK3ohsJb79MQGDYrVU2QimPFhYJMPVhPaUD0RL lpbPvxldcAnbml9bfOZbLbAV3Uw7uYz03d1qWAkO9P7lJENxQ3afcIuCSQIpt3AEi1UUqc6yP0 GRNl9tv+lbq/rBtKgMZquDgp3cy8cc2D1i6TFC4/Vn7YSd5J4zB9C9M5Mh5KZnE/NFPRprxU9k Az+Uf1Pl3Kegn1Bs/9xcdxfmQ3gphOsT7Etr0U1oLFe8nPXwYiQ9gHHi8lOM91g/XBhEHJHlA5 u+U= X-IronPort-AV: E=Sophos;i="5.76,383,1592899200"; d="scan'208";a="52501830" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 02 Sep 2020 11:03:11 -0800 IronPort-SDR: 6Owj6STEH9c7smMG2IJKswxmH3/eK/QQeBur2WYfcM0nYtei00uCuDPpBairhlGbyv3X/7P1ji pUXB87xcuASQ1KICxDLUh0Le/aRwOf15wg0aM8u8xI//l1WcPZJ3HkBC1FubQ6A44F9umqNN5A o4keTKMkGxa9l3jsGYjFZ/Zi+iUXhjUDQdSsZ6HeSQE08s7fUCGQdkDeD+aTr66femQJXjY8og R8aHZ7gxLPPGoVZwxPbntNidz2jPT5yiFJjBMwlteofdN84Txan+DN1AeyNvp/lnVr4rs5fSD0 53E= From: Vijai Kumar K To: , Subject: [PATCH v2 10/10] meta-isar/canned-wks: Remove /boot mountpoint Date: Thu, 3 Sep 2020 00:32:47 +0530 Message-ID: <20200902190247.15421-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200902190247.15421-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200902185624.15044-9-Vijaikumar_Kanagarajan@mentor.com> <20200902190247.15421-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com X-ClientProxiedBy: svr-orw-mbx-08.mgc.mentorg.com (147.34.90.208) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-TUID: Th/IAC0+H+Xw In the older version of wic, the fstab entry for /boot mountpoint was skipped. However in the latest wic this is not the case. Adding a /boot mountpoint in part results in creating a fstab entry for automount. Remove it to avoid the unwanted mount which makes original contents unavailable in debian rootfilesystem. Signed-off-by: Vijai Kumar K --- RECIPE-API-CHANGELOG.md | 17 +++++++++++++++++ .../lib/wic/canned-wks/common-isar.wks.inc | 2 +- meta-isar/scripts/lib/wic/canned-wks/hikey.wks | 2 +- .../scripts/lib/wic/canned-wks/sdimage-efi.wks | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 1839770..070cde3 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -246,3 +246,20 @@ by setting DEBIAN_BUILD_DEPENDS. ${S} can now be used for checking out sources without being linked implicitly with ${D} which needs to be filled explicitly in do_install as before. + +### Wic adds /boot mountpoint to fstab + +With the latest wic, /boot mount point, if any, is added to /etc/fstab. Debian +uses /boot to store the kernel and initrd images. If an image's wks file +specifies /boot mountpoint for boot partitions like EFI, the image may fail to +boot or might make the original contents of /boot unavailable after boot. +All unwanted /boot mountpoints should be removed. + +Below is an example wks entry that might cause an issue. +``` +part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk sda --label efi --part-type EF00 --align 1024 +``` +Drop the /boot entry to avoid issues. +``` +part --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk sda --label efi --part-type EF00 --align 1024 +``` diff --git a/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc b/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc index c8ea4c2..e7dabd4 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc +++ b/meta-isar/scripts/lib/wic/canned-wks/common-isar.wks.inc @@ -1,3 +1,3 @@ # This file is included into 3 canned wks files from this directory -part /boot --source bootimg-pcbios-isar --ondisk sda --label boot --active --align 1024 +part --source bootimg-pcbios-isar --ondisk sda --label boot --active --align 1024 part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 diff --git a/meta-isar/scripts/lib/wic/canned-wks/hikey.wks b/meta-isar/scripts/lib/wic/canned-wks/hikey.wks index 1e82f8c..840858e 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/hikey.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/hikey.wks @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: MIT -part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk mmcblk1 --label efi --part-type EF00 --align 1024 +part --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk mmcblk1 --label efi --part-type EF00 --align 1024 part / --source rootfs --ondisk mmcblk1 --fstype ext4 --label platform --align 1024 --use-uuid diff --git a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks index 2afa016..e0fa7a1 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks @@ -2,7 +2,7 @@ # long-description: Creates a partitioned EFI disk image without any swap that # the user can directly dd to boot media. -part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk sda --label efi --part-type EF00 --align 1024 +part --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk sda --label efi --part-type EF00 --align 1024 part / --source rootfs --ondisk sda --fstype ext4 --label platform --align 1024 --use-uuid -- 2.17.1