Skip to contentSkip to conversation

wic: Introduce the --use-label partition parameter

PATCH Superseded Kevin Hao 2 participants 3 messages Sep 6, 2018

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Kevin Hao

author
#0 lore raw

PATCH 1/1 wic: Introduce the --use-label partition parameter

We can use this parameter to make the wic use the label to name a partition in /etc/fstab.

---
 scripts/lib/wic/help.py                  | 18 +++++++++++++-----
 scripts/lib/wic/ksparser.py              |  7 ++++++-
 scripts/lib/wic/partition.py             |  1 +
 scripts/lib/wic/plugins/imager/direct.py |  2 ++
 4 files changed, 22 insertions(+), 6 deletions(-)
scripts/lib/wic/help.py +13 -5
index 842b868a575a..e250e130ef46 100644
@@ -866,11 +866,11 @@ DESCRIPTION
        Partitions with a <mountpoint> specified will be automatically mounted.
        This is achieved by wic adding entries to the fstab during image
        generation. In order for a valid fstab to be generated one of the
-       --ondrive, --ondisk or --use-uuid partition options must be used for
-       each partition that specifies a mountpoint.  Note that with --use-uuid
-       and non-root <mountpoint>, including swap, the mount program must
-       understand the PARTUUID syntax.  This currently excludes the busybox
-       versions of these applications.
+       --ondrive, --ondisk, --use-uuid or --use-label partition options must
+       be used for each partition that specifies a mountpoint.  Note that with
+       --use-{uuid,label} and non-root <mountpoint>, including swap, the mount
+       program must understand the PARTUUID or LABEL syntax.  This currently
+       excludes the busybox versions of these applications.
 
 
        The following are supported 'part' options:
@@ -945,6 +945,14 @@ DESCRIPTION
                         label is already in use by another filesystem,
                         a new label is created for the partition.
 
+         --use-label: This option is specific to wic. It makes wic to use the
+                      label in /etc/fstab to specify a partition. If the
+                      --use-label and --use-uuid are used at the same time,
+                      we prefer the uuid because it is less likely to cause
+                      name confliction. We don't support to use this parameter
+                      on a root partition since the kernel can't understand the
+                      LABEL syntax.
+
          --active: Marks the partition as active.
 
          --align (in KBytes): This option is specific to wic and says
scripts/lib/wic/ksparser.py +6 -1
index e590b2fe3c0d..220495b76654 100644
@@ -141,6 +141,7 @@ class KickStart():
                                    'squashfs', 'vfat', 'msdos', 'swap'))
         part.add_argument('--mkfs-extraopts', default='')
         part.add_argument('--label')
+        part.add_argument('--use-label', action='store_true')
         part.add_argument('--no-table', action='store_true')
         part.add_argument('--ondisk', '--ondrive', dest='disk', default='sda')
         part.add_argument("--overhead-factor", type=overheadtype)
@@ -197,10 +198,14 @@ class KickStart():
                                              (confpath, lineno, err))
                     if line.startswith('part'):
                         # SquashFS does not support UUID
-                        if parsed.fstype == 'squashfs' and parsed.use_uuid:
+                        if parsed.fstype == 'squashfs' and (parsed.use_uuid or parsed.use_label):
                             err = "%s:%d: SquashFS does not support UUID" \
                                   % (confpath, lineno)
                             raise KickStartError(err)
+                        if parsed.use_label and not parsed.label:
+                            err = "%s:%d: Must set the label with --label" \
+                                  % (confpath, lineno)
+                            raise KickStartError(err)
                         # using ArgumentParser one cannot easily tell if option
                         # was passed as argument, if said option has a default
                         # value; --overhead-factor/--extra-space cannot be used
scripts/lib/wic/partition.py +1 -0
index 5054779b1b6b..3da7e23e617e 100644
@@ -47,6 +47,7 @@ class Partition():
         self.fsopts = args.fsopts
         self.fstype = args.fstype
         self.label = args.label
+        self.use_label = args.use_label
         self.mkfs_extraopts = args.mkfs_extraopts
         self.mountpoint = args.mountpoint
         self.no_table = args.no_table
scripts/lib/wic/plugins/imager/direct.py +2 -0
index 81583e97b9f7..bb14a334b2ce 100644
@@ -155,6 +155,8 @@ class DirectPlugin(ImagerPlugin):
                         device_name = "UUID=%s" % part.fsuuid
                 else:
                     device_name = "PARTUUID=%s" % part.uuid
+            elif part.use_label:
+                device_name = "LABEL=%s" % part.label
             else:
                 # mmc device partitions are named mmcblk0p1, mmcblk0p2..
                 prefix = 'p' if  part.disk.startswith('mmcblk') else ''
Signature · 1 line
2.14.4
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Kevin Hao

We can use this parameter to make the wic use the label to name a partition in /etc/fstab.

A few minor things below:

[snip]

scripts/lib/wic/help.py DESCRIPTION · line 954

Quoted 11 lines
scripts/lib/wic/help.py +7 -0
@@ -945,6 +945,14 @@ DESCRIPTION
                         label is already in use by another filesystem,
                         a new label is created for the partition.
 
+         --use-label: This option is specific to wic. It makes wic to use the
+                      label in /etc/fstab to specify a partition. If the
+                      --use-label and --use-uuid are used at the same time,
+                      we prefer the uuid because it is less likely to cause
+                      name confliction. We don't support to use this parameter
+                      on a root partition since the kernel can't understand the
+                      LABEL syntax.

I think we should have the last sentence read more like:
We don't support using this parameter on the root partition since it requires an initramfs to parse this value and we do not currently support that.

Only because while what you said is correct, this makes it clear what would be needed to support it.

scripts/lib/wic/ksparser.py class KickStart(): · line 204

Quoted 9 lines
scripts/lib/wic/ksparser.py +1 -1
@@ -197,10 +198,14 @@ class KickStart():
                                              (confpath, lineno, err))
                     if line.startswith('part'):
                         # SquashFS does not support UUID
-                        if parsed.fstype == 'squashfs' and parsed.use_uuid:
+                        if parsed.fstype == 'squashfs' and (parsed.use_uuid or parsed.use_label):
                             err = "%s:%d: SquashFS does not support UUID" \
                                   % (confpath, lineno)
                             raise KickStartError(err)

This hunk is going to conflict with Emmanuel's patch. Further I think it should be a separate check on fstype == squashfs and (label && use_label) with a label-specific error message. Thanks!

Signature · 1 line
Tom
author
#2 lore raw
Quoted 29 lines · Tom Rini
Quoted 4 lines · Kevin Hao

We can use this parameter to make the wic use the label to name a partition in /etc/fstab.

A few minor things below:

[snip]

scripts/lib/wic/help.py DESCRIPTION · line 954

Quoted 11 lines
scripts/lib/wic/help.py +7 -0
@@ -945,6 +945,14 @@ DESCRIPTION
                         label is already in use by another filesystem,
                         a new label is created for the partition.
 
+         --use-label: This option is specific to wic. It makes wic to use the
+                      label in /etc/fstab to specify a partition. If the
+                      --use-label and --use-uuid are used at the same time,
+                      we prefer the uuid because it is less likely to cause
+                      name confliction. We don't support to use this parameter
+                      on a root partition since the kernel can't understand the
+                      LABEL syntax.

I think we should have the last sentence read more like:
We don't support using this parameter on the root partition since it requires an initramfs to parse this value and we do not currently support that.

Quoted 2 lines

Only because while what you said is correct, this makes it clear what would be needed to support it.

Absolutely. I will rephrase it as what you suggested.

Quoted 14 lines

scripts/lib/wic/ksparser.py class KickStart(): · line 204

Quoted 10 lines
scripts/lib/wic/ksparser.py +1 -1
@@ -197,10 +198,14 @@ class KickStart():
                                              (confpath, lineno, err))
                     if line.startswith('part'):
                         # SquashFS does not support UUID
-                        if parsed.fstype == 'squashfs' and parsed.use_uuid:
+                        if parsed.fstype == 'squashfs' and (parsed.use_uuid or parsed.use_label):
                             err = "%s:%d: SquashFS does not support UUID" \
                                   % (confpath, lineno)
                             raise KickStartError(err)

This hunk is going to conflict with Emmanuel's patch. Further I think it should be a separate check on fstype == squashfs and (label && use_label) with a label-specific error message. Thanks!

Thanks for the notice. I will rebase on the Emmanuel's new version patch.

Thanks,
Kevin

Quoted 3 lines
Signature · 2 lines
-- 
Tom