RE: [PATCH v2 2/2] wic: Update to the latest revision

["Kanagarajan, Vijaikumar" <Vijaikumar_Kanagarajan@mentor.com>]

> -----Original Message-----
> From: Henning Schild <henning.schild@siemens.com>
> Sent: 13 June 2022 14:32
> To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>
> 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 <Vijaikumar_Kanagarajan@mentor.com>:
> 
> > Update to the latest wic from OE-core.
> >
> > OE-core Revision: 06ed2aa93fc25a681e3a00ee120d9395b04845da
> >
> > Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> > ---
> >  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

Noted. Will change the text accordingly in V3.

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.  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