From patchwork Wed Sep 2 11:02:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 29 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp658697ooj; Wed, 2 Sep 2020 12:03:13 -0700 (PDT) X-Received: by 2002:adf:dd0e:: with SMTP id a14mr8430865wrm.151.1599073393127; Wed, 02 Sep 2020 12:03:13 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1599073393; cv=pass; d=google.com; s=arc-20160816; b=mO4+Yeq/5/bqL198bMWvLuwOgrfOBrOz7ln+2GkYrI0Ou5LXVPc0cgJviXKb91uu53 JlwHro2RetWg3IBPjAzkylLbEq1SJMqwQi8LvVxYF3BIyTImsXMKtQoS1mO/0htCaceC cebZ0LwyW20tZ0mB21T4F6GuefsK2vJCRjHUJjg9MDpLGJ6B00IkTjikbAy3OVLig2EJ OCwoEPOU0fFcHUVGkky/YrwQp2goffDUM6bGm9dT8hDHRycy+cFUeaABISDjId72xAX5 ZWAPBSps25se9IcDG1oKo1L8nfn9NatTeXjU0ruF/dlEmR18miNrzcXzsJiYglQf4TV4 wMDg== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=bJpm4DbQZ1h04ehfJt4ORvKNMsv3a4QNasVOCHTiYHs=; b=Jf8+eyERHY56CVxISSBdEa7SmHb/UALgNu1m9kugGF5bF2ll/brFFi61lyBY3OVLSx wrTu/jMPyqJL3BNARdOWE/A8CHp8ytMQpguCqw8tlxOT/bmLY+41r1Yl9Ug8GD/2eSfC Tn/mPdkazdTbGW7RT8CYE13sR1gB0xLAmCAf/B7cXvQvGgJPXiawNusX/O2pZSaD/dkx iFxqOBnHJCQBuJGkc3OxYWyQ4WtjIJGMc9lrekN7kyNDkAJxTtKhmGvtKJA4DZWrMoeI R44ZPyg7RNFtXD3qdUu86Mtsz0NYPmP2Fu+sJzO7HDtySJmEjL+Zqbq3JzJ/fVXIWupn Ui5Q== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=hHOXOv0N; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb4gyx75akgqe6nvqv4i@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB4GYX75AKGQE6NVQV4I@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id f2sor71525wrr.55.2020.09.02.12.03.12 (Google Transport Security); Wed, 02 Sep 2020 12:03:13 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrb4gyx75akgqe6nvqv4i@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=hHOXOv0N; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb4gyx75akgqe6nvqv4i@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB4GYX75AKGQE6NVQV4I@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1599073392; cv=pass; d=google.com; s=arc-20160816; b=oxNpsCFxENBIwMA9/Sm0lnSxm5sJN0Yq8flLVqF1CGNRIGdTs6HTR3WkhWeOajuls5 NxqSAdz6s1iJkj5KGikbJ5Z1D0OaYYZJiXa2eva/31NiLO+tsGEXKu9WbTqe8SsLxiuz gZ6DnVqR61Lth9UC48/RYXaV2ePszUBw1kpBX8GMO+EOejzDPe2UfLHlwWzvA5BPOYqN ruG52DCtZ/CLOz7MP7fiPvGGk5Fdq/yGLh7DD2APc1CWNRDya1ockF4fV9AQ09jHUFx6 TL3fg4K3YSE/pXnXYxtr8NYKt4GgM2ka/gTAoVR+Z094xauzNjX2eICMOGC038xYpWRk WEJA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=bJpm4DbQZ1h04ehfJt4ORvKNMsv3a4QNasVOCHTiYHs=; b=0eUeVF75iSEBlfBj7itsxQa5E95Z4zHGacfSl528anofvYvssb0H9+hUCMs2XtLskV wTSyE4PopK/fBG4nXDqnThl7W/IzIMz7asjz2Hrlw3KV2yu6TYABr+X+5VsIAn/2g4lP D/OA5u6iXsjanUMh9sxxfgj7FJtCXvzuzXsrgf4j6HHZP2pY42TsUdPFagdNFpRrwrkC qrZTnfMhHClbZtsJFIKFIidPJqg5fvdhirKj8NLuP7co6ryiGlO716QQxPrPQtLlziFM ZsXy3vPJSGf+TqD1pKE/aTtK5+wxzusribK0U0gVnQTgCTM+GR1ZXaA2zhHPeOTfPBEe 5maQ== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:ironport-sdr:ironport-sdr:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=bJpm4DbQZ1h04ehfJt4ORvKNMsv3a4QNasVOCHTiYHs=; b=hHOXOv0Nt0//zi3UMhkAUkLx8G16CNOXdNUOVoWFUVpuvo96s/1tb5/IunP/y9Ey0E lC54v5J0vM+w/6kZsAEM9v2cMr6Bqa1KzxCvPsgSTJ5Cfd1/lmsq+js5CBg9+xlb70kx 1qxuBfPUUIVbLMWfDPjYeUFLmEAMGbw6RXiNAn8DrexFtaxD8rVKHV/UDLdPfsoxpfOO FlKntxZt5P6YT7EQThL+GNMhRqURpVoXVFpYmZLgD/R3HYjH7ZOD6JFd8LvlUIGSeVRQ UtYxcK3kX+MQBTkX0chj6Gyg14yxoJ0TXDnjuSbq1jznzGhkxiNaqgP4H9uOKMhaZSiY Km0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:ironport-sdr:ironport-sdr:from:to:subject :date:message-id:in-reply-to:references:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-subscribe:list-unsubscribe; bh=bJpm4DbQZ1h04ehfJt4ORvKNMsv3a4QNasVOCHTiYHs=; b=TZQCVKm/rIhradbg8xWbvsO76y09DIKaelKlHUkhAh4iKxpmcJXtTvmybT3S/kmj76 xROYhZQjT7g47KjWR9HgDeFapizyigKLfa5Qd3BvnQTWiZ1nkIOe0egCP8RaBPItyFia wlJ2ifAXtmCUle+fFmli7EweQRFrVVrmGEibEI9t9aJk7AdZOnd62aR/J/8RLLTvBQOF P0W5x1CrcJEXtLnuidpak3IEzrUrKax3c5i6Jnxkg727K5ls21bmZn2E/qRhGLw1uId8 zLcXespQFduCfNdVTroQYSlinnzB74KH+X4xCnQaHjG1H3PEhcqb4PwA3v46iOpiP6fQ Dn/g== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM53191LtNGLUTz7OOgmtGZo9c6QMuud9bbCWRVE+NtVf348MzTl9+ C71K3Wxr/+bxl3uKQf8ICXk= X-Google-Smtp-Source: ABdhPJwbmsLx2WEk81tTl/secQTZJ4MV9gUcmmpwRswaXy84kC8YghG0x2iyagonukAo0nxCKHGHhg== X-Received: by 2002:a5d:4448:: with SMTP id x8mr9065896wrr.207.1599073392755; 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-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 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; 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 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-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1676749981840873035?= X-GMAIL-MSGID: =?utf-8?q?1676749981840873035?= 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