From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7108629846932062208 X-Received: by 2002:a1f:fc83:0:b0:35e:7db1:5654 with SMTP id a125-20020a1ffc83000000b0035e7db15654mr10947031vki.0.1655110932910; Mon, 13 Jun 2022 02:02:12 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6122:148a:b0:35d:f1da:7bce with SMTP id z10-20020a056122148a00b0035df1da7bcels140894vkp.8.gmail; Mon, 13 Jun 2022 02:02:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJycReYyTZCpBUTnGDpxkYpj/h174ouWw3PcJqfMoOVDceEWN9F1qt3TX1RPDkyV15jkZwds X-Received: by 2002:a1f:4593:0:b0:35e:5a6:68ce with SMTP id s141-20020a1f4593000000b0035e05a668cemr14990031vka.27.1655110932295; Mon, 13 Jun 2022 02:02:12 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1655110932; cv=pass; d=google.com; s=arc-20160816; b=Prb5X33J6Mywkipxx8U0MWccg35fwDhXSDKNrTrckpmhfeinXJZBcHYPi6uXtzpW5I fgvQqWsCHAvQkfi6TqDA+UtPYC40Aa4dDW2WFbJfsnxmjWgCYncWf/vSBqKAQ1KI8GY1 KNvHewQUQK4YkYofVvo0s0q8LS6NM/GoEE971kr3vXkyqvrhIQDdZZ+YVA09RTsvKP14 KU3m6FH17SwSEPPIt1N0WJiGaHuuDjSbFOYJ/AsD8/ozth4tSrhydNPisvpl1ATc5Fgi q7cIXFPCU/PK5mXI1ANuRAi3XpqNbHEVLBb9ih+VofKrvuVUGH0/nSDoqzijioQYSKFv OodA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=VX5k6isP/lTSEMXXKqQhRDR6Bf6n0XMTpObnoYKurKg=; b=LOCCjGQC2l8ZnGUHyoH5WlQjzfKUMc/QuSDy16zSihWE7lJoFDbblMs0GK36JpfKiL JFi66SwqtBDtpZGN9mKxC/5b4bGNYtoQgHjzYUWTABdIAUtlD1nRc6YvPn0nxu1unvJ3 7C2kGIbh7mL0kW/0/tRsaEsly7FfC15NEChkTcYidwKrFOJkyl2L+vO7uDXatJXtx1le pRwnLU6oHflC1LfLq/1+FH36WUetxetbQUUphU50QN7uVZMPdrn/4tgGM078/mmOCwsn utSRGDVyTdH/rL8PsXI6dpmCWeCrWeu2fAfPkcPoJ95bBFwlGuO4SZ3EVkRmAN359LLJ QUZw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=h67WXT8k; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0d::60d as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on060d.outbound.protection.outlook.com. [2a01:111:f400:fe0d::60d]) by gmr-mx.google.com with ESMTPS id w125-20020a1f9483000000b0035df1d45071si435592vkd.1.2022.06.13.02.02.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jun 2022 02:02:12 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0d::60d as permitted sender) client-ip=2a01:111:f400:fe0d::60d; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=h67WXT8k; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0d::60d as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IMa+OUSpu7VDuDtIy1v/CzAENaen419aUvA/dcv6TzQmHrqIHj9nToHTEj7PsFxq9ukJE2U0IGTCwLUF8dBxt/q4n9tu+0NMWMJPX6tdkSdvk2gMd89m1C0bGkOXmMYDW/n91rddBlNz9GrDTg8090cDKB5tUXHZofKnyw63hVkaPtp1mgAezQEyhgp42+pRv49UYFHryVCGdN6X4lB+kwu75wxgrfZ+Y+1oKgjvp0LrHAWTnQPDeBUQpaVTAR6+QwgW1BNLHBo/CMpZltBBGP+79kl0XcsoDr+021GL2DjQ03uVab2706alz4qHW7atdbiJClDc2p1U/1Opvwz/EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=VX5k6isP/lTSEMXXKqQhRDR6Bf6n0XMTpObnoYKurKg=; b=B5ujC7s2rtSz2bGOm9tc1glGSme1QuH+lGCWgcV1isXIwZD4H1UB8lVLyGVsmgEodrq6tEdJF5Uw91xoXfmPnICeAJHx6TvmxULrfCneOK/oIaVcUeNE62HTFBFvFrk7pcSG6NEEvG29syuLKa6tdorNJBsZbcHVdYSpV+VAs1QKImCrJ+YcGEIu7nmqBRxduT8plw1g7cgtmoPgq+F+n8rIrt2CHWiW42ZKAwofiMXdIAO5I5MAAo7+9QGM0777yF8/TWaZzY+c3fiytylf7+qlVl6FgaJTg4Sph8f7qhexl39BMswE68zo5fTzd/l9hB2EQ2m8O76uWYLcAuUYcA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VX5k6isP/lTSEMXXKqQhRDR6Bf6n0XMTpObnoYKurKg=; b=h67WXT8khkFelZNvvADAUUDbpUssPJ7IL16BC3ra/YnPLZG4HK3ohN/whxmvJQIhBZJ/yN/WituK7RoU3oEYTTPTms7Qm5S2d+LN865fR9O7T/81KZxekHZWAloJzT10xG6Q7r8+ysBnonVgdgvCU83O74F/01Wb7InnmyTMmEfO2MgbKHdQACuZO+Nkf89zggoD9kS0NP/rdy86SGFd2lcnbVJd2XgUbA7zJP9izCKVDecXb1fphr1tHbBYfqYXlDQ6czybbCeGpf4+PBiQtcbiSr9AG94F90BluW6yTxxPXPaysE6c16ySSqTbSU86s7rLRgQPbgyYlfotuz28Fg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) by DU0PR10MB6274.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:3ed::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.20; Mon, 13 Jun 2022 09:02:09 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::b925:3d3d:8f5f:c4d9]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::b925:3d3d:8f5f:c4d9%7]) with mapi id 15.20.5332.017; Mon, 13 Jun 2022 09:02:08 +0000 Date: Mon, 13 Jun 2022 11:02:06 +0200 From: Henning Schild To: Vijai Kumar K Cc: , Subject: Re: [PATCH v2 2/2] wic: Update to the latest revision Message-ID: <20220613110206.0fa05e12@md1za8fc.ad001.siemens.net> In-Reply-To: <20220613075401.2059119-3-Vijaikumar_Kanagarajan@mentor.com> References: <20220613075401.2059119-1-Vijaikumar_Kanagarajan@mentor.com> <20220613075401.2059119-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.34; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: AM6P195CA0087.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:86::28) To PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 331bcfe3-a045-4e59-8789-08da4d1b654e X-MS-TrafficTypeDiagnostic: DU0PR10MB6274:EE_ X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1OZ8hn5lvGLEXhzpivXv6T/PkXBjTfCPnq4hVJ8J5PJfHPPhy2YrZO8VjXoqOKdUW/e+Lpe5qVF1CH/QtGftJN9W0nQkdMSZUq5V1C+wTogZNIbqL+2lQvMPd5eTkpGlxrc7pB+TbHZ4S/yZkVULWUaUYQMN/1pb2AkWAdBIcxx7HqMdHcvteQuh4l03HJRRseCTyLPd9RMRjfVmvN6sDIqwiaiARGGVLcfI+VB2zTEldtwIxqZZAKqEVFzYwY/SjuesbwTAuWigwfT/vyf+LiTA26/KOzjaXYOuKEHG8B5lma0jXM45kuryP2ngDBmYq7iaTK3WSi4Bp8qWPu0YtsjT8Vfejg6NvEp+6LuzmgJh2O91O5tGWnkLb7aQH1J7Hs/YS8NauoGNlqKiPI/0cy9TDwrV53to9y1RBHF8vXJ2DGGbyl6paYvlyHebHnBMX0X2SvbQGy+Yxl9/Rf65tt5msIt7lqacl2bh481ErJvgLqJv0AWVc51IYvyFZZOss4xjRtnszJrVgCIljgN59TjEM6h8LkJzM84K+aozvihAEpryeECCXAKXlfxNztvccWDxA0bwVruULGq9/QgZEx9e6qGSl7m0kBURBJdQwYQWtChJOlT3VaH+j47LjYbqFvtNDpKKA0CtgwwD87ClOg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230016)(4636009)(366004)(44832011)(86362001)(82960400001)(2906002)(15650500001)(5660300002)(107886003)(26005)(8936002)(6512007)(508600001)(6506007)(9686003)(6916009)(54906003)(6486002)(66476007)(66946007)(1076003)(186003)(66556008)(4326008)(8676002)(83380400001)(38100700002)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/qz0g27AvednbozKYiRPjx3xg1zviStIa3hVDPSt60S3UjwmLAwNHZpNosyb?= =?us-ascii?Q?7Xqp7Qg80iHMwEYOqrOKYpsHabQsA13C5+1K0s+0mLdjdY8X/FvHsQjk3YbS?= =?us-ascii?Q?mWdaP0XlNK3j/fNbE6uMcJB4wgbGbUiew74NgS61QFCMu/TMZPN90SR+EXHM?= =?us-ascii?Q?7NrI3fXrojeB8p2RNPOTv8BpGQO1P8zwQfaOosXW4xx63JlrTGclNsHeRQ8q?= =?us-ascii?Q?Yzy7Wp8aPMbqoUXaMF5Z+DlApN1kiVvMBy+ubJeadwe07NEF98UXlp7r+3ct?= =?us-ascii?Q?fimBTD6AwLBZXOgFc2QbumpbUyA9CGqxcxWoPPHK5PEV+/wUaBYmo2d71D49?= =?us-ascii?Q?mo0HSHA4OhyJt0oCNBpTnLuJJg8eaK1Qm893Hf+D2xKormJtV9JPpxHHl9AR?= =?us-ascii?Q?vW+w4nNL538i+KKouZoCrgK4tOtjOb50QkwRjd7SVTdoVcfFxIggQWMULnuR?= =?us-ascii?Q?z/0IFrPUT1GLOYWKO6EHM7xeFCwgpR72px5MsYEcHo4GI+b94N45PZlc9mo+?= =?us-ascii?Q?RQc1PDJO3srBhuzjce0H+Rh1pp5MvvmfAnnFsSsB99SiFxeTheju/yrYqs8o?= =?us-ascii?Q?6pzZIfelPSiP585O+cwHu9Wevm/bxak3MzV0D79i4UzZJE9i6ao76Pq0kccg?= =?us-ascii?Q?z03GLhHoEcQUl4/YS5RLOMiZhmxeONj6ih5coS4U4yzKc1SVXsmTew7r7Mjw?= =?us-ascii?Q?cn6e95bFI95MOwFprdxw5uGSZhE7g8wBWBhLPm/gCmWOkRzK9jtS7bUdOKK/?= =?us-ascii?Q?afE+cQo3YRdGDDb1vLy+u4+XAjPI6+6NUG6mFutgEbzp5Qo9UuDnVxNGBUUS?= =?us-ascii?Q?sIRosJFcZUBRMoEYhlsWfI0LtTdbvHUd6Xlkek7WA2JGxj2E+ggS7nrt4hZ1?= =?us-ascii?Q?4bGWUE3V5iogtHixrXfxg08p/3pWIbXLtwxjBqHhYq7ySQRQkcH4/IMGHyYq?= =?us-ascii?Q?nmb6BcO4O4FtRY6ctyMp411w54SEr61XSc7bbl4ZTZvQ2qk8fjOcLkgqRnKl?= =?us-ascii?Q?4Ztx6ZTXEprgyd7hjlKmLmE5mqkgbVcocosNhKPAf6dU+Zda9zcsuzoJpXVG?= =?us-ascii?Q?fWUWXbiDcW4YyTtfvsP0HftQ/xTnOPRHXZsFHEyERIOuB6u1jF7uMLlLIzC9?= =?us-ascii?Q?MJET9NXLr4uoOUakHBXQ/tQx6g5H1uHSkgXsXcTASPEfX2yAQGmfWXUhaR31?= =?us-ascii?Q?0pWLN25/02HmbcAF9oQZI2iUbeZK05WNXmMTDy+iC2A3dHwXsPY4AAGzF42Q?= =?us-ascii?Q?lBjvTnXKv2A/68k8jz1SCZYbjDAVKP/isufoFUTCyA/2jgtvb77D5KFDHV/Z?= =?us-ascii?Q?yG9iPHIRJZq8yzLgjE1fc8dU5PuX30hCSfUL5vp+9M57xyifD/vTlgEK5/Jr?= =?us-ascii?Q?eNt5jhrJN+IE/PZrc/w++3W13AIjArWgNi5/C2wu1yXIpwkYM5e3Cl31nn/c?= =?us-ascii?Q?yAljbrNAGyp0v8OUbrRcJ1/A6CdfE2V/SAKnpshwWBLD13kg0htya/Ou7B+0?= =?us-ascii?Q?g1PiTIsV4P6nEohP459CJpTl9usr25LIdVuMQrvK+SI2m+QyXKBe1/H2EkZa?= =?us-ascii?Q?0Un3/CpF38g1ZTE99M+w7eyOSorSzytJR0fTLPYLO0NPov5O6qNYYowJm8Ji?= =?us-ascii?Q?WqNLfyzBW7CEmRZ2WoLYsg+jKrZ3lMENQQO5XOmymjRT5r6vS3Q+bN1zNANY?= =?us-ascii?Q?iDpSP/mWJ1P+gSQAxLZJaKOb9Xtbb3/q9EaxwzOzIA+3s6dNTNc8dJ7m8OkM?= =?us-ascii?Q?s2ysh6B0iZ4P6VwWIKvG8l2zFNVkXU0=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 331bcfe3-a045-4e59-8789-08da4d1b654e X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2022 09:02:08.6853 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 40DZt2Xc1D2e3aSS0DGhdeqXfboJfzptYzZomKcR3u6sLr74r4EKv28CCz8Okex1EWu5v9wb6qxH34/wXtimawvU54IwY9L1loK6N7U92Wk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR10MB6274 X-TUID: eWsmVs0AjyQI Am Mon, 13 Jun 2022 13:24:01 +0530 schrieb Vijai Kumar K : > Update to the latest wic from OE-core. > > OE-core Revision: 06ed2aa93fc25a681e3a00ee120d9395b04845da > > Signed-off-by: Vijai Kumar K > --- > RECIPE-API-CHANGELOG.md | 19 +++++++++++++++++++ > scripts/lib/wic/help.py | 6 ++++++ > scripts/lib/wic/ksparser.py | 1 + > scripts/lib/wic/partition.py | 1 + > scripts/lib/wic/plugins/imager/direct.py | 5 +++-- > 5 files changed, 30 insertions(+), 2 deletions(-) > > diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md > index 2998824..436b204 100644 > --- a/RECIPE-API-CHANGELOG.md > +++ b/RECIPE-API-CHANGELOG.md > @@ -406,3 +406,22 @@ groups are now created after all packages are > installed. > Changes in next > --------------- > + > +### Wic adds / mountpoint to fstab > + > +In the older version of wic, any mount point named / is skipped from > adding +into the fstab entry. > + > +With the latest wic, this is not the case. / mount point, if any, is > added +to /etc/fstab for automount. > + > +Any wks file which assumed that / would be skipped from /etc/fstab > should +now be corrected. Otherwise, it might result in multiple / > entries in /etc/fstab. +One by the image_configure_fstab function > from image class and one by wic. + > +Below is an example wks entry that might cause an issue. > +Replace "part /" with "part" to avoid adding duplicate entry for /. I am not sure multiple entries would be an issue, i think the last one will simply always win. It is good to have a note about that change, but i doubt people really have to do anything. And if anything has to be done, isar should drop the first one centrally. The fstab entry for root is purely for adding some weird mount options, usually root is not mounted with fstab but with cmdline and initrd. And not having / in fstab just makes that rootfs more generic ... it can become part of nfs and next guy takes it as btrfs while next guy takes it as ext4. Note is good, advise is not Henning > + > +``` > +part / --source rootfs --ondisk sda --fstype ext4 --label platform > --align 1024 --use-uuid +``` > diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py > index 4ff7470..73e3380 100644 > --- a/scripts/lib/wic/help.py > +++ b/scripts/lib/wic/help.py > @@ -940,6 +940,12 @@ DESCRIPTION > quotes. If not specified, the default string > is "defaults". > > + --fspassno: Specifies the order in which filesystem checks > are done > + at boot time by fsck. See fs_passno parameter > of > + fstab(5). This parameter will be copied into > the > + /etc/fstab file of the installed system. If not > + specified the default value of "0" will be used. > + > --label label: Specifies the label to give to the filesystem > to be made on the partition. If the given > label is already in use by another > filesystem, diff --git a/scripts/lib/wic/ksparser.py > b/scripts/lib/wic/ksparser.py index 0df9eb0..a49b7b9 100644 > --- a/scripts/lib/wic/ksparser.py > +++ b/scripts/lib/wic/ksparser.py > @@ -155,6 +155,7 @@ class KickStart(): > part.add_argument('--change-directory') > part.add_argument("--extra-space", type=sizetype("M")) > part.add_argument('--fsoptions', dest='fsopts') > + part.add_argument('--fspassno', dest='fspassno') > part.add_argument('--fstype', default='vfat', > choices=('ext2', 'ext3', 'ext4', 'btrfs', > 'squashfs', 'vfat', 'msdos', > 'erofs', diff --git a/scripts/lib/wic/partition.py > b/scripts/lib/wic/partition.py index 09e491d..e50871b 100644 > --- a/scripts/lib/wic/partition.py > +++ b/scripts/lib/wic/partition.py > @@ -33,6 +33,7 @@ class Partition(): > self.include_path = args.include_path > self.change_directory = args.change_directory > self.fsopts = args.fsopts > + self.fspassno = args.fspassno > self.fstype = args.fstype > self.label = args.label > self.use_label = args.use_label > diff --git a/scripts/lib/wic/plugins/imager/direct.py > b/scripts/lib/wic/plugins/imager/direct.py index 4d0b836..c44159b > 100644 --- a/scripts/lib/wic/plugins/imager/direct.py > +++ b/scripts/lib/wic/plugins/imager/direct.py > @@ -117,7 +117,7 @@ class DirectPlugin(ImagerPlugin): > updated = False > for part in self.parts: > if not part.realnum or not part.mountpoint \ > - or part.mountpoint == "/" or not > part.mountpoint.startswith('/'): > + or not part.mountpoint.startswith('/'): > continue > > if part.use_uuid: > @@ -138,8 +138,9 @@ class DirectPlugin(ImagerPlugin): > device_name = "/dev/%s%s%d" % (part.disk, prefix, > part.realnum) > opts = part.fsopts if part.fsopts else "defaults" > + passno = part.fspassno if part.fspassno else "0" > line = "\t".join([device_name, part.mountpoint, > part.fstype, > - opts, "0", "0"]) + "\n" > + opts, "0", passno]) + "\n" > > fstab_lines.append(line) > updated = True