From patchwork Mon Sep 7 08:20:18 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: 43 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp3468046ooj; Mon, 7 Sep 2020 09:20:55 -0700 (PDT) X-Received: by 2002:a17:906:3e81:: with SMTP id a1mr21267113ejj.227.1599495655212; Mon, 07 Sep 2020 09:20:55 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1599495655; cv=pass; d=google.com; s=arc-20160816; b=R7NEwU3nBA16El+Y/mOiJ4yfWWhpr6egQb8bur5RR8GXBPGsgfMNttVcybrutVpeQr z6hCbtLwpy+sVGtBozKd06wwLrRhZZYQnWEefG8j09Kf58xGr6VH8hQGuHEwWyxTo+i8 OnCi8MoxI5JFESAiwffP3oEK4q7PQGbViwWO8ylucJ4ycq3PYLfEAcOsxpoo5/xfUEY9 St1bskt8GH3xOl30mYiLqLSdxY7s01Yz0GkMOsbgyoovUCQEqfKniRGb5sspUYK3U4WH t6nAdolyhqvv4aN9T9+iUHuxwbbISplrpWBt8WNkSxOUOOkM2VkQQ/fE8Y/5XhPezY3l C1mg== 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=EuPL0IMB64hCDuGMfLH6Y7fij6jsQM4S+jZQkzB0sAY=; b=chtAFDD7vpLz83Ec3N8WFmRHytQTzHzIeULP8/BEd47WCE0hrWKXGkGitHOv1s2sOn BS4+8ZueflftyBhxTYfFee+ZdD3EVM5UDRydElfY5tTd4pLsTqU4nOKYftLvPHryWtH5 9P2YInhtcWNFPjpazewF1UfnXyz9klmrhI1KxZvhAlj3ksh6qho7h8jTv0/lEqjyeo61 WNhsSADpHXs7AhUorQ+0NFX3efDOAOMwE9mNFHCgOknMkXpHGj4FXplOqxvas/DNYJnd /ZM485Rty38DPTGkqA93Yj1sq76bdxbOR+MdK/kYlbZ/SMjA1fk+4fotHzQUWjh4MZHV 32dg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=jiEbTBzP; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbzv33h5akgqetoe6kia@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBZV33H5AKGQETOE6KIA@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 k9sor2398279ejj.82.2020.09.07.09.20.55 (Google Transport Security); Mon, 07 Sep 2020 09:20:55 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbzv33h5akgqetoe6kia@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=jiEbTBzP; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbzv33h5akgqetoe6kia@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBZV33H5AKGQETOE6KIA@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1599495655; cv=pass; d=google.com; s=arc-20160816; b=wZ+7BNr60TAzWkLEs5IC+KG3kFZS5UDrDmnmekFuRjdutewIrRadC135a5FwBDJWd8 v9d6ZhCJDFhmqiYXsmuRKHgYXR8gHQF4NkXFcyT2nq/Llll98iTNlM2i5fIeZE7NzxZ2 95gLuD0siunkpc6H34UgyjrWIHvp3HEwVDSfJ8vWyQ9beWYDhc9g/Pmk/qi6VdbyxkHR 8+KgIudx9sP/xyisSKwQjyyJlevgBkOAto8YhE41PgQfEIOv3pbbGYI9dTx6m2KSUNWn jptoxaIlvTsUFMbIXOrB5FDM+VvBNMPqInUKtYiK0u2mVGUs5YuYX65LSj1hXLzGK6t/ oBlw== 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=EuPL0IMB64hCDuGMfLH6Y7fij6jsQM4S+jZQkzB0sAY=; b=wLKFniLpsOn9kV31/L1rVArLRbtOP/hMDyKUrqzK6vM6k9OjFUFvHygfqasV13IIeG PJIdYZYrmvIaxPjpdTDlbQo5CoBzc5fvsOwk2+x0fD1SN0YkK/8jU/H47SaGbJLJnPqo +iQGd+tvT7CU5VydygPEowCdar/IOGVHNoGnYLswxzb+sU7NCqWERFZrJfPT7SJo68GA VAo8lPE7h9qYpmFOiX3BGoBq99CpOzXbo9CobS9RxDwEMuGC3qVTknn6wBwmt1n0yiRk +2zcVx1qYFm0+BffLDchWMdWzbL8poWiysw3tNFW0T65BEor8USCI05AzUmi2ZyspTDg AalA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 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=EuPL0IMB64hCDuGMfLH6Y7fij6jsQM4S+jZQkzB0sAY=; b=jiEbTBzPnQfL1wdI6/wSpMJRz6zxLfP2okJiW3SeEB2rYbQcoysvvOW5O8VyaRjZCB O5NFHMtwdTLBD9shmsMz1DdF+RfKAFU2UginTUj1KPRol8QPsGTiRsjnSHS8rV6rKy/P Gw+DlMern+tuDdz70pGLG8oEiGWO/rTLQirRkt0tVEVnELoetwj5Nw/zz7yf3WNLLuVj 2256x0StXWRDtVwwS2aazMy9JkA53SfqtrL/ptHJuwbqsZ0iIoYhD0/pb09PXZ9GUOOb hF6yTEjx+5SFCwOH7hFOMf16b2f1nqq6h2Fls9MZHZPErsZeiaRfLQZikmUH/YvO1U4I W0WQ== 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=EuPL0IMB64hCDuGMfLH6Y7fij6jsQM4S+jZQkzB0sAY=; b=VVvCQvuoyCmp/yfhqCBxDG96RRPzD7GKLOA7rHlwyafLKW6bYhasQxOhkjPv+/8Z9+ zxt5uD0PMoqDYRjdm0DNCX+oyJ3mqcb9JolE80M1dZpK1UzShwGzvB13G4NheD97HLSy BD0a6tmfuJGT0Cd6HKA1CMT88YmdS4ix+1DGtE0Vnm/cJlmEtf01L16r62foBUnHV8U5 DtFzcD0i+VFGrDKlP1t4/2DYhyPFtaep7/OQBGrmqCVzHWmMuLJ7XdzyIwJQLlx3TIlV /iLDlSWRMnynALg9fhhRFyrxEBP9uXuBrpsES5KVJEYInasGwIcStSRmb44Ms9w5+Ea1 zbvA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533dYs8HSLaaVOJuPsOMlkoY9oKovJzYcS5tb5HKJGu2dNJEFGDq 6TJ8v+CDSTgAupWpOLcR/0g= X-Google-Smtp-Source: ABdhPJzQUw73yvTBEu0qFn0tHMA0ocBRpKGfm7NSUWKnPuc5KgER9j7xiSeS10SfFO8QV9aqR4GTlg== X-Received: by 2002:a17:906:e87:: with SMTP id p7mr21111969ejf.547.1599495654841; Mon, 07 Sep 2020 09:20:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:f1c6:: with SMTP id gx6ls1124676ejb.8.gmail; Mon, 07 Sep 2020 09:20:53 -0700 (PDT) X-Received: by 2002:a17:906:77d1:: with SMTP id m17mr22169406ejn.96.1599495653818; Mon, 07 Sep 2020 09:20:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599495653; cv=none; d=google.com; s=arc-20160816; b=05tyRQSN9dZllVTn2WRJoQX1spvMjUKazKldApRdyYf/vE1uZ8tJ3S6a3A+UzlXf3/ c+7qz2MB8gArS8I9K0epdzv8VAVq7hDJXnagJA9ctkGI5WhJjX6Dot2vPK4kXIduEMZH GjISIXvfRz/Bc7qByDzFsxwEuUoSqW0Bdy4yrRS7hm3nRszh22HBrfhtc5RxeSkUeliR +T6cn5kHVR2+Y6424mhpG1Q64axsASbX5kriimAlqPLtD7fVV4cRgcquS6ACxk06tnsa hkkRnlTLc3XI60d5Pg7WkS0SxUh9vZ9HELZoDWcboS2sODOUKHb2w9/Mv/yMlslPR8ft R3Jw== 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=/eIQ4flEnHFLsnbLrsaYvjdU3f8OXhRnWV8EVZn2e3M=; b=sz1K/speomKauLLhoV2IAuovPnhGd484TLswZphiKiioWs1hSMrB5U0FlfbvXjvLI9 vTKbKNHGp5E/JXYHTaQ8UxDcORgBX9n8GLCBC7qNUUOCB55ycjAhp9jNDUcI8fD2Buhb wnV6pIGM7sGoowPNPmA+T8+u+IeiJfBUj/hMOyWcAscMkW5JMa8txnAz9IaplnKUaq+K UFA0nnI/CF3Q2H/cyiJid9xamVOaaLaVWu1bMoeD+11oZDgNdwjjRo5bZfUVnjUgb41O u5ihuHZLdRcoDanFDUA1Q6nCZZjJ7BIlo1tjcJ7Up5ik/SyYtOpGVW4g48Rrt9no3tBE Kqpw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com. [68.232.137.252]) by gmr-mx.google.com with ESMTPS id w16si466474edq.4.2020.09.07.09.20.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Sep 2020 09:20:53 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: K1KhRBqna0+rN+O+yw9OL+qQ6qGnl9b3jiptiHMZ7mJH4W9zSvZBzLjSNsOEPaM2BNRyWhJDtQ iPCc3+CaV8tRS7MAmwo6DU+UJYlRys0jPJPwEmAKFgw9Pv07myUfDQ6L0tAuW1e+C9PCeUL4HJ 6qn4mfTM/u7DB6Ll5Ics1seNkPlUxO63zJHfS78Czk9s7MM0PcVsVSisteJtKF8dxng4Pj3oI5 VV2TmQ+Be4ug0ujSOUPLBn+noaM7wKToV3FbWwW2l3tjWAjTXhq/n9k/PQQdWjvMjscvmPuVeU vbc= X-IronPort-AV: E=Sophos;i="5.76,402,1592899200"; d="scan'208";a="52770206" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 07 Sep 2020 08:20:52 -0800 IronPort-SDR: pq+Ig9ULJV6kUy1HQHnRkpsqXoRQEiKFeGUQMWilVD7Xx7zRO6Pc5co+ynxyBt2OREl5y0e7oJ tGrleolCVvU3x3e0IqL57gP27ZbxjZEbMIEcJdjSt3ireWrK+m6DHXSFgIm6Iza/givpyW1W39 kbVLeYGxaeZU3hi8Y/DnlrRu4T3jYJ814A1pq1QA2a6ad5Kx2GdQRaWlD9MsKG9N86Zif1px1X Vy+QI0h+TFWYN9NWtVtPZ1gdEJ/1wMNcJDWnz2XvzQjErF92a7oqzv97vocFWbjORELF+le9l/ xv8= From: Vijai Kumar K To: , Subject: [PATCH v3 9/9] meta-isar/canned-wks: Remove unwanted /boot mountpoint Date: Mon, 7 Sep 2020 21:50:18 +0530 Message-ID: <20200907162018.16636-6-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200907162018.16636-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200907161756.16372-4-Vijaikumar_Kanagarajan@mentor.com> <20200907162018.16636-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-09.mgc.mentorg.com (147.34.90.209) 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.252 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?1677192755863575132?= X-GMAIL-MSGID: =?utf-8?q?1677192755863575132?= 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. It is observed that in some kickstart files, /boot is used as a mount point for bootloaders. This was okay with the previous wic since anyway it ignored adding /boot mount points to fstab. With the new wic, this now causes an unwanted mount of that partition in /boot which inturn makes the original contents of /boot unavailable after a successful boot. This is not the default behaviour expected. Remove such bogus /boot mount point in wks files. Signed-off-by: Vijai Kumar K --- RECIPE-API-CHANGELOG.md | 23 +++++++++++++++++++ .../lib/wic/canned-wks/common-isar.wks.inc | 2 +- .../scripts/lib/wic/canned-wks/hikey.wks | 2 +- .../lib/wic/canned-wks/sdimage-efi.wks | 2 +- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 1839770..c677b1d 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -246,3 +246,26 @@ 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. + +Any wks file which assumed that /boot would be skipped from /etc/fstab should +now be corrected. Otherwise, the original /boot contents, i.e kernel initrd & +config files will be unavailable after boot. + +Below is an example wks entry that might cause an issue. The rootfs already +has /boot with valid contents. Specifying /boot as mount point for the efi +partition would only make /boot contents of "part /" unavailable after boot. +``` +part /boot --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 +``` +If mounting /boot parition is an unwanted behaviour in your target then +remove it. +``` +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 +``` 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