diff --git a/man/ukify.xml b/man/ukify.xml
index bf6f328536..68c72b0ba1 100644
--- a/man/ukify.xml
+++ b/man/ukify.xml
@@ -292,6 +292,29 @@
+
+ OSRelease=TEXT|@PATH
+
+
+ The os-release description (the .osrel section). The argument
+ may be a literal string, or @ followed by a path name. If not specified, the
+ os-release5 file
+ will be picked up from the host system.
+
+
+
+
+
+ Cmdline=TEXT|@PATH
+
+
+ The kernel command line (the .cmdline section). The argument may
+ be a literal string, or @ followed by a path name. If not specified, no command
+ line will be embedded.
+
+
+
+
Initrd=INITRD...
@@ -314,24 +337,12 @@
- Cmdline=TEXT|@PATH
-
+ Splash=PATH
+
- The kernel command line (the .cmdline section). The argument may
- be a literal string, or @ followed by a path name. If not specified, no command
- line will be embedded.
-
-
-
-
-
- OSRelease=TEXT|@PATH
-
-
- The os-release description (the .osrel section). The argument
- may be a literal string, or @ followed by a path name. If not specified, the
- os-release5 file
- will be picked up from the host system.
+ A picture to display during boot (the .splash section). The
+ argument is a path to a BMP file. If not specified, the section will not be present.
+
@@ -348,16 +359,35 @@
- Splash=PATH
-
+ Uname=VERSION
+
- A picture to display during boot (the .splash section). The
- argument is a path to a BMP file. If not specified, the section will not be present.
-
+ Specify the kernel version (as in uname -r, the
+ .uname section). If not specified, an attempt will be made to extract the
+ version string from the kernel image. It is recommended to pass this explicitly if known, because
+ the extraction is based on heuristics and not very reliable. If not specified and extraction fails,
+ the section will not be present.
+
+ SBAT=TEXT|@PATH
+
+
+ SBAT metadata associated with the UKI or addon. SBAT policies are useful to revoke
+ whole groups of UKIs or addons with a single, static policy update that does not take space in
+ DBX/MOKX. If not specified manually, a default metadata entry consisting of
+ uki,1,UKI,uki,1,https://uapi-group.org/specifications/specs/unified_kernel_image/
+ for UKIs and
+ uki-addon,1,UKI Addon,addon,1,https://www.freedesktop.org/software/systemd/man/latest/systemd-stub.html
+ for addons will be used, to ensure it is always possible to revoke them. For more information on
+ SBAT see Shim documentation.
+
+
+
+
+
PCRPKey=PATH
@@ -370,19 +400,6 @@
-
- Uname=VERSION
-
-
- Specify the kernel version (as in uname -r, the
- .uname section). If not specified, an attempt will be made to extract the
- version string from the kernel image. It is recommended to pass this explicitly if known, because
- the extraction is based on heuristics and not very reliable. If not specified and extraction fails,
- the section will not be present.
-
-
-
-
PCRBanks=PATH
@@ -488,23 +505,6 @@
-
-
- SBAT=TEXT|@PATH
-
-
- SBAT metadata associated with the UKI or addon. SBAT policies are useful to revoke
- whole groups of UKIs or addons with a single, static policy update that does not take space in
- DBX/MOKX. If not specified manually, a default metadata entry consisting of
- uki,1,UKI,uki,1,https://uapi-group.org/specifications/specs/unified_kernel_image/
- for UKIs and
- uki-addon,1,UKI Addon,addon,1,https://www.freedesktop.org/software/systemd/man/latest/systemd-stub.html
- for addons will be used, to ensure it is always possible to revoke them. For more information on
- SBAT see Shim documentation.
-
-
-
-
diff --git a/src/ukify/ukify.py b/src/ukify/ukify.py
index 76437f25e5..5a36ce06ee 100755
--- a/src/ukify/ukify.py
+++ b/src/ukify/ukify.py
@@ -1264,6 +1264,13 @@ CONFIG_ITEMS = [
action = 'store_true',
),
+ ConfigItem(
+ ('--config', '-c'),
+ metavar = 'PATH',
+ type = pathlib.Path,
+ help = 'configuration file',
+ ),
+
ConfigItem(
'--linux',
type = pathlib.Path,
@@ -1271,6 +1278,20 @@ CONFIG_ITEMS = [
config_key = 'UKI/Linux',
),
+ ConfigItem(
+ '--os-release',
+ metavar = 'TEXT|@PATH',
+ help = 'path to os-release file [.osrel section]',
+ config_key = 'UKI/OSRelease',
+ ),
+
+ ConfigItem(
+ '--cmdline',
+ metavar = 'TEXT|@PATH',
+ help = 'kernel command line [.cmdline section]',
+ config_key = 'UKI/Cmdline',
+ ),
+
ConfigItem(
'--initrd',
metavar = 'INITRD',
@@ -1290,24 +1311,11 @@ CONFIG_ITEMS = [
),
ConfigItem(
- ('--config', '-c'),
- metavar = 'PATH',
+ '--splash',
+ metavar = 'BMP',
type = pathlib.Path,
- help = 'configuration file',
- ),
-
- ConfigItem(
- '--cmdline',
- metavar = 'TEXT|@PATH',
- help = 'kernel command line [.cmdline section]',
- config_key = 'UKI/Cmdline',
- ),
-
- ConfigItem(
- '--os-release',
- metavar = 'TEXT|@PATH',
- help = 'path to os-release file [.osrel section]',
- config_key = 'UKI/OSRelease',
+ help = 'splash image bitmap file [.splash section]',
+ config_key = 'UKI/Splash',
),
ConfigItem(
@@ -1317,13 +1325,23 @@ CONFIG_ITEMS = [
help = 'Device Tree file [.dtb section]',
config_key = 'UKI/DeviceTree',
),
+
ConfigItem(
- '--splash',
- metavar = 'BMP',
- type = pathlib.Path,
- help = 'splash image bitmap file [.splash section]',
- config_key = 'UKI/Splash',
+ '--uname',
+ metavar='VERSION',
+ help='"uname -r" information [.uname section]',
+ config_key = 'UKI/Uname',
),
+
+ ConfigItem(
+ '--sbat',
+ metavar = 'TEXT|@PATH',
+ help = 'SBAT policy [.sbat section]',
+ default = [],
+ action = 'append',
+ config_key = 'UKI/SBAT',
+ ),
+
ConfigItem(
'--pcrpkey',
metavar = 'KEY',
@@ -1331,11 +1349,14 @@ CONFIG_ITEMS = [
help = 'embedded public key to seal secrets to [.pcrpkey section]',
config_key = 'UKI/PCRPKey',
),
+
ConfigItem(
- '--uname',
- metavar='VERSION',
- help='"uname -r" information [.uname section]',
- config_key = 'UKI/Uname',
+ '--section',
+ dest = 'sections',
+ metavar = 'NAME:TEXT|@PATH',
+ action = 'append',
+ default = [],
+ help = 'section as name and contents [NAME section] or section to print',
),
ConfigItem(
@@ -1353,24 +1374,6 @@ CONFIG_ITEMS = [
config_key = 'UKI/Stub',
),
- ConfigItem(
- '--sbat',
- metavar = 'TEXT|@PATH',
- help = 'SBAT policy [.sbat section]',
- default = [],
- action = 'append',
- config_key = 'UKI/SBAT',
- ),
-
- ConfigItem(
- '--section',
- dest = 'sections',
- metavar = 'NAME:TEXT|@PATH',
- action = 'append',
- default = [],
- help = 'section as name and contents [NAME section] or section to print',
- ),
-
ConfigItem(
'--pcr-banks',
metavar = 'BANK…',