diff options
| author | Gertalitec <97767846+Gertalitec@users.noreply.github.com> | 2023-03-23 01:09:10 +0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2023-03-26 16:54:16 +0200 |
| commit | 600362aa11af5af90125aacc8ad7612a5cb80a68 (patch) | |
| tree | 9b47a30843d5d181ed07de702f46693dd5e88058 /src/kernel-install | |
| parent | f33c1c49a5b29e530cdc134669fe978337356528 (diff) | |
| download | systemd-600362aa11af5af90125aacc8ad7612a5cb80a68.tar.gz | |
Define $KERNEL_INSTALL_UKI_GENERATOR
Define $KERNEL_INSTALL_UKI_GENERATOR in case one wants it to be different from $KERNEL_INSTALL_INITRD_GENERATOR. This can be useful if one wants to use mkinitcpio / Dracut to generate the initrd, but without creating the UKI so this can be left for e.g. ukify or something else. Right now these initrd generators will read /etc/kernel/install.conf and generate the UKI
Diffstat (limited to 'src/kernel-install')
| -rw-r--r-- | src/kernel-install/install.conf | 1 | ||||
| -rwxr-xr-x | src/kernel-install/kernel-install.in | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/kernel-install/install.conf b/src/kernel-install/install.conf index 43b6e7d792..4520c01d72 100644 --- a/src/kernel-install/install.conf +++ b/src/kernel-install/install.conf @@ -9,3 +9,4 @@ #layout=bls|other|... #initrd_generator=dracut|... +#uki_generator=ukify|... diff --git a/src/kernel-install/kernel-install.in b/src/kernel-install/kernel-install.in index a16c29d2aa..611f67243c 100755 --- a/src/kernel-install/kernel-install.in +++ b/src/kernel-install/kernel-install.in @@ -106,9 +106,10 @@ else shift fi -# These two settings are only settable via install.conf +# These three settings are only settable via install.conf layout= initrd_generator= +uki_generator= # These two settings can be inherited from the environment _MACHINE_ID_SAVED="$MACHINE_ID" _BOOT_ROOT_SAVED="$BOOT_ROOT" @@ -132,6 +133,8 @@ fi [ -n "$layout" ] && log_verbose "$install_conf configures layout=$layout" [ -n "$initrd_generator" ] && \ log_verbose "$install_conf configures initrd_generator=$initrd_generator" +[ -n "$uki_generator" ] && \ + log_verbose "$install_conf configures uki_generator=$uki_generator" if [ -n "$_MACHINE_ID_SAVED" ]; then MACHINE_ID="$_MACHINE_ID_SAVED" @@ -307,6 +310,7 @@ export KERNEL_INSTALL_ENTRY_TOKEN="$ENTRY_TOKEN" export KERNEL_INSTALL_BOOT_ROOT="$BOOT_ROOT" export KERNEL_INSTALL_LAYOUT="$layout" export KERNEL_INSTALL_INITRD_GENERATOR="$initrd_generator" +export KERNEL_INSTALL_UKI_GENERATOR="$uki_generator" export KERNEL_INSTALL_STAGING_AREA MAKE_ENTRY_DIR_ABS=0 @@ -383,6 +387,7 @@ case "$COMMAND" in echo "KERNEL_INSTALL_BOOT_ROOT: $KERNEL_INSTALL_BOOT_ROOT" echo "KERNEL_INSTALL_LAYOUT: $KERNEL_INSTALL_LAYOUT" echo "KERNEL_INSTALL_INITRD_GENERATOR: $KERNEL_INSTALL_INITRD_GENERATOR" + echo "KERNEL_INSTALL_UKI_GENERATOR: $KERNEL_INSTALL_UKI_GENERATOR" echo "ENTRY_DIR_ABS: $KERNEL_INSTALL_BOOT_ROOT/$ENTRY_TOKEN/\$KERNEL_VERSION" # Assert that ENTRY_DIR_ABS actually matches what we are printing here |