From 51638edaa00befaed58e2def255d46ae44d9234f Mon Sep 17 00:00:00 2001 From: Kevin Hao Date: Wed, 12 Sep 2018 08:44:46 +0800 Subject: 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. Signed-off-by: Kevin Hao Reviewed-by: Tom Rini Signed-off-by: Richard Purdie --- scripts/lib/wic/ksparser.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'scripts/lib/wic/ksparser.py') diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index a5d29189b9..7e5a9c5092 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py @@ -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,8 +198,17 @@ class KickStart(): (confpath, lineno, err)) if line.startswith('part'): # SquashFS does not support filesystem UUID - if parsed.fstype == 'squashfs' and parsed.fsuuid: - err = "%s:%d: SquashFS does not support UUID" \ + if parsed.fstype == 'squashfs': + if parsed.fsuuid: + err = "%s:%d: SquashFS does not support UUID" \ + % (confpath, lineno) + raise KickStartError(err) + if parsed.label: + err = "%s:%d: SquashFS does not support LABEL" \ + % (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 -- cgit 1.2.3-korg