diff options
author | Tom Rini <trini@konsulko.com> | 2017-12-13 22:20:25 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-18 18:03:58 +0000 |
commit | 9ebc8301965b6b0aedc1d0cb8a9bc3e4893f2592 (patch) | |
tree | 60259eec51fd4c61f1cb04fa3203a9412bf2ff28 /scripts/lib/wic/help.py | |
parent | 20748d8ddcd41c5c6897d1a711cf157ab1080f9a (diff) | |
download | poky-9ebc8301965b6b0aedc1d0cb8a9bc3e4893f2592.tar.gz |
wic: Introduce --fsuuid and have --use-uuid make use of UUID too
First, allow for wic to be given a filesystem UUID to be used when
creating a filesystem. When not provided, wic will generate the UUID to
be used. Next, when --use-uuid is passed, we update the fstab to mount
things via UUID (and if not found, then use PARTUUID) as UUID is more
portable.
(From OE-Core rev: 9256b8799495634ee8aee5d16ff71bd6e6e25ed4)
Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/help.py')
-rw-r--r-- | scripts/lib/wic/help.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py index 2ac45e052e..bf658b94e3 100644 --- a/scripts/lib/wic/help.py +++ b/scripts/lib/wic/help.py | |||
@@ -863,7 +863,10 @@ DESCRIPTION | |||
863 | This is achieved by wic adding entries to the fstab during image | 863 | This is achieved by wic adding entries to the fstab during image |
864 | generation. In order for a valid fstab to be generated one of the | 864 | generation. In order for a valid fstab to be generated one of the |
865 | --ondrive, --ondisk or --use-uuid partition options must be used for | 865 | --ondrive, --ondisk or --use-uuid partition options must be used for |
866 | each partition that specifies a mountpoint. | 866 | each partition that specifies a mountpoint. Note that with --use-uuid |
867 | and non-root <mountpoint>, including swap, the mount program must | ||
868 | understand the PARTUUID syntax. This currently excludes the busybox | ||
869 | versions of these applications. | ||
867 | 870 | ||
868 | 871 | ||
869 | The following are supported 'part' options: | 872 | The following are supported 'part' options: |
@@ -986,6 +989,11 @@ DESCRIPTION | |||
986 | in bootloader configuration before running wic. In this case .wks file can | 989 | in bootloader configuration before running wic. In this case .wks file can |
987 | be generated or modified to set preconfigured parition UUID using this option. | 990 | be generated or modified to set preconfigured parition UUID using this option. |
988 | 991 | ||
992 | --fsuuid: This option is specific to wic. It specifies filesystem UUID. | ||
993 | It's useful if preconfigured filesystem UUID is added to kernel command line | ||
994 | in bootloader configuration before running wic. In this case .wks file can | ||
995 | be generated or modified to set preconfigured filesystem UUID using this option. | ||
996 | |||
989 | --system-id: This option is specific to wic. It specifies partition system id. It's useful | 997 | --system-id: This option is specific to wic. It specifies partition system id. It's useful |
990 | for the harware that requires non-default partition system ids. The parameter | 998 | for the harware that requires non-default partition system ids. The parameter |
991 | in one byte long hex number either with 0x prefix or without it. | 999 | in one byte long hex number either with 0x prefix or without it. |