From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7108629846932062208 X-Received: by 2002:adf:dbc3:0:b0:22a:d393:bd84 with SMTP id e3-20020adfdbc3000000b0022ad393bd84mr12126355wrj.626.1664168006491; Sun, 25 Sep 2022 21:53:26 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:490a:0:b0:225:6559:3374 with SMTP id x10-20020a5d490a000000b0022565593374ls10421391wrq.2.-pod-prod-gmail; Sun, 25 Sep 2022 21:53:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5BMe1W4gLkyOyQWxcRim+CiRQcyCnd/kurRP19CWtmfWKhxabXwa6lFilv48xSQshx1EfR X-Received: by 2002:a05:6000:156b:b0:22a:a83a:d349 with SMTP id 11-20020a056000156b00b0022aa83ad349mr12408497wrz.277.1664168005047; Sun, 25 Sep 2022 21:53:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664168005; cv=none; d=google.com; s=arc-20160816; b=nNTv5hKsUuyJCMMEeFDjy/ViaQwnMMGVRHODxyKFox5VnaaX4NiWM97Qkvb78mZM8d evF5KPc7KSbCVsazcUZzl0ozkBjH0ZG+og7a+GjZl6OXV4y5rcnXktZMo311OOaZqED6 euiPncathK8ZKZ1XxJIvPTaJstKQxDSpXChiTu2UVMkmeek/l57eZUKRnOIETqh16tuI Yuua3mJtYUVBKNJsgmCAd2vXYeU9QPgoP+hA9Hdr/vUSN+6JG6GuVSAtoiWsvaDINCpe h6UgSvjfFAFfyLF+FBfXHhuuKjwlRyhWEtUcB3+lvcNVER/N3bMh9CbY5aWKeceySaqf gdqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:msip_labels:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:ironport-sdr; bh=XdSPKD03ht0wYgcQFKj5RGA95ZsH/BHSXR/sde7AT+Q=; b=1CeOefN53LRbdBoGFn/nRaTHNPtpoFhXhDO79COyOrB6CixYaHvsnPpC27l7upoEr0 p2Y/woeUc17eZTQ9uYRdnUyUmMbxj4YpToYmWO4QtE8eSbagOsmfbaL5L3Bn0BXBMlUg HhmmY6jZuREWS3vsJatvzzVpmWJboiO3W9hfZmTg7KhSG1hXxTzEWozA2ex7Shmm4yfZ oJ7hb7EXpzrIGLH4GjkOnEeF6I0BZjfV8xikZsq7cjZBKfFfJZfaK0h2mweWVswFSE7v ogAqepHI+/OVgC60f/CJiZTEDw12vizrvpZsvbbsrmjcnwGL1SbVLlx6JSt9Iyn3K5WA gpSA== 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 m25-20020a7bce19000000b003a83f11cec0si312421wmc.2.2022.09.25.21.53.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Sep 2022 21:53:25 -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 X-IronPort-AV: E=Sophos;i="5.93,345,1654588800"; d="scan'208";a="83469291" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 25 Sep 2022 20:53:23 -0800 IronPort-SDR: cscWuM+gXXtsBc9DoNjDuxyi+Mxq/wb63zlpVrrNaDAL3M3YaL2Xd+AdTjaHsWRIqOR4y3kR1k x/H27OzYTbSKhBao7Ihz5HyQegnwzIbzisOOsQW0ZOX7hQWBj0ayAQxASPwNkgTr1272JLtkSK Pl7V+gy/Gh60oX5jXmqeQChwffCBUBAgyYQwilw7rXCQXvjdhi3ZTm1mJ3iOLVjU29b5RH6N56 E8BBgwY3wO4mNOCdmSOrTLPrAETc4uzItlSnkfuJmrDTJE6UKz/e8iGWYWQXa1//Girck5IQke x50= From: "Kanagarajan, Vijaikumar" To: "Moessbauer, Felix (T CED SES-DE)" , "Schild, Henning (T CED SES-DE)" CC: "Kiszka, Jan (T CED)" , "isar-users@googlegroups.com" Subject: RE: [PATCH v2 2/2] wic: Update to the latest revision Thread-Topic: [PATCH v2 2/2] wic: Update to the latest revision Thread-Index: AQHYfvrNjxcm/IOVjEqBYz97LelxMa1Nf+UA//+ObwCABgyv8ICe7lSA//+/hAA= Date: Mon, 26 Sep 2022 04:53:20 +0000 Message-ID: <6157334379c44f8b938983d5c4dfd8b1@mentor.com> References: <20220613075401.2059119-1-Vijaikumar_Kanagarajan@mentor.com> <20220613075401.2059119-3-Vijaikumar_Kanagarajan@mentor.com> <20220613110206.0fa05e12@md1za8fc.ad001.siemens.net> <476c6e8a8687499a85fced0e07299815@mentor.com> <8babb01d7eae44e0b9faecad59cdc1d4@mentor.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_Enabled=true; MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_SetDate=2022-09-26T01:40:33Z; MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_Method=Standard; MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_Name=restricted; MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_SiteId=38ae3bcd-9579-4fd4-adda-b42e1495d55a; MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_ActionId=f3afea29-d3bd-47f4-8f42-9364a3e5cf77; MSIP_Label_9d258917-277f-42cd-a3cd-14c4e9ee58bc_ContentBits=0 x-originating-ip: [147.34.91.1] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-TUID: oZ0QcynPrUut > -----Original Message----- > From: Moessbauer, Felix (T CED SES-DE) > Sent: 26 September 2022 07:11 > To: Kanagarajan, Vijaikumar ; > Schild, Henning (T CED SES-DE) > Cc: Kiszka, Jan (T CED) ; isar- > users@googlegroups.com > Subject: RE: [PATCH v2 2/2] wic: Update to the latest revision >=20 > Hi Vijai & Henning, >=20 > Are there any news on this? > I just discovered that still many (if not all) of our images are affected= by this > bug. Hi Felix, Unfortunately not. If we already have the latest wic, --no-fstab-update[1] = might help.(untested). [1] https://github.com/openembedded/openembedded-core/commit/ab4c95af8ecd15= dc136194ab761afae756db5803 Thanks, Vijai Kumar K >=20 > While it is not serios, having error messages in the journal is still pre= tty bad: > systemd-fstab-generator[1491]: Failed to create unit file > /run/systemd/generator/-.mount, as it already exists. Duplicate entry in > /etc/fstab? >=20 > Felix >=20 > > -----Original Message----- > > From: isar-users@googlegroups.com On > > Behalf Of Kanagarajan, Vijaikumar > > Sent: Friday, June 17, 2022 1:46 PM > > To: isar-users@googlegroups.com > > Cc: Kiszka, Jan (T CED) ; Schild, Henning (T > > CED SES- > > DE) > > Subject: RE: [PATCH v2 2/2] wic: Update to the latest revision > > > > > > > > > -----Original Message----- > > > From: Kanagarajan, Vijaikumar > > > Sent: 13 June 2022 14:48 > > > To: 'Henning Schild' > > > Cc: isar-users@googlegroups.com; jan.kiszka@siemens.com > > > Subject: RE: [PATCH v2 2/2] wic: Update to the latest revision > > > > > > > > > > > > > -----Original Message----- > > > > From: Henning Schild > > > > Sent: 13 June 2022 14:32 > > > > To: Kanagarajan, Vijaikumar > > > > Cc: isar-users@googlegroups.com; jan.kiszka@siemens.com > > > > Subject: Re: [PATCH v2 2/2] wic: Update to the latest revision > > > > > > > > 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 cent= rally. > > > > > > > > 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 > > > > > > Noted. Will change the text accordingly in V3. > > > > Ok we cannot drop / mountpoint name(though optional). We would be > lose > > the ability to find out UUID of root using rootdev api. > > This is used by some plugins. So the better way would be to use the > > --no-fstab- update. Seems like we can set them per partition now. > > > > Thanks, > > Vijai Kumar K > > > > > > > > Thanks, > > > Vijai Kumar K > > > > > > > > > > > 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. I= f not > > > > > + specified the default value of "0" will be = used. > > > > > + > > > > > --label label: Specifies the label to give to the files= ystem > > > > > to be made on the partition. If the give= n > > > > > 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=3Dsizetype("M")) > > > > > part.add_argument('--fsoptions', dest=3D'fsopts') > > > > > + part.add_argument('--fspassno', dest=3D'fspassno') > > > > > part.add_argument('--fstype', default=3D'vfat', > > > > > choices=3D('ext2', 'ext3', 'ext4', 'bt= rfs', > > > > > '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 =3D args.include_path > > > > > self.change_directory =3D args.change_directory > > > > > self.fsopts =3D args.fsopts > > > > > + self.fspassno =3D args.fspassno > > > > > self.fstype =3D args.fstype > > > > > self.label =3D args.label > > > > > self.use_label =3D 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 =3D False > > > > > for part in self.parts: > > > > > if not part.realnum or not part.mountpoint \ > > > > > - or part.mountpoint =3D=3D "/" or not > > > > > part.mountpoint.startswith('/'): > > > > > + or not part.mountpoint.startswith('/'): > > > > > continue > > > > > > > > > > if part.use_uuid: > > > > > @@ -138,8 +138,9 @@ class DirectPlugin(ImagerPlugin): > > > > > device_name =3D "/dev/%s%s%d" % (part.disk, > > > > > prefix, > > > > > part.realnum) > > > > > opts =3D part.fsopts if part.fsopts else "defaults" > > > > > + passno =3D part.fspassno if part.fspassno else "0" > > > > > line =3D "\t".join([device_name, part.mountpoint, > > > > > part.fstype, > > > > > - opts, "0", "0"]) + "\n" > > > > > + opts, "0", passno]) + "\n" > > > > > > > > > > fstab_lines.append(line) > > > > > updated =3D True > > > > -- > > You received this message because you are subscribed to the Google > > Groups "isar-users" group. > > To unsubscribe from this group and stop receiving emails from it, send > > an email to isar-users+unsubscribe@googlegroups.com. > > To view this discussion on the web visit > > > https://eur01.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Fgrou > > ps.g > > oogle.com%2Fd%2Fmsgid%2Fisar- > > > users%2F8babb01d7eae44e0b9faecad59cdc1d4%2540mentor.com&dat > a=3D > > > 05%7C01%7Cfelix.moessbauer%40siemens.com%7C237b0db9bb724580ca540 > 8 > > > da5024a3ad%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C6379104 > > > 15537105828%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQ > Ijo > > > iV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sda > ta > > > =3D%2F%2F1Fxy%2B%2BEgDI4RfUEZ38qy1Q82esArdBuRftDuE1t6s%3D&re > se > > rved=3D0.