diff --git a/man/kernel-install.xml b/man/kernel-install.xml index 83255bb932..bb76074d2e 100644 --- a/man/kernel-install.xml +++ b/man/kernel-install.xml @@ -171,11 +171,15 @@ KERNEL_INSTALL_BOOT_ROOT= is set for the plugins to the root directory (mount point, usually) of the hierarchy where boot-loader entries, kernel images, and associated resources should be placed. Can be overridden by setting BOOT_ROOT=. - KERNEL_INSTALL_LAYOUT=bls|other|... specifies the installation layout. + KERNEL_INSTALL_LAYOUT=bls|other|... is set for the plugins to specify the installation layout. Defaults to if $BOOT/MACHINE-ID exists, or otherwise. Additional layout names may be defined by convention. If a plugin uses a special layout, it's encouraged to declare its own layout name and configure layout= in install.conf upon initial installation. + KERNEL_INSTALL_INITRD_GENERATOR=... is set for plugins to select the initrd generator. + This should be configured as initrd_generator= in install.conf. + + bls diff --git a/src/kernel-install/install.conf b/src/kernel-install/install.conf index e4802e6fae..43b6e7d792 100644 --- a/src/kernel-install/install.conf +++ b/src/kernel-install/install.conf @@ -8,3 +8,4 @@ # See kernel-install(8) for details. #layout=bls|other|... +#initrd_generator=dracut|... diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install index e56483ef96..fe457c1070 100755 --- a/src/kernel-install/kernel-install +++ b/src/kernel-install/kernel-install @@ -80,6 +80,9 @@ fi KERNEL_VERSION="$1" shift +layout= +initrd_generator= + if [ -r "/etc/kernel/install.conf" ]; then . /etc/kernel/install.conf elif [ -r "/usr/lib/kernel/install.conf" ]; then @@ -123,12 +126,12 @@ if [ -z "$layout" ]; then fi fi - ENTRY_DIR_ABS="$BOOT_ROOT/$MACHINE_ID/$KERNEL_VERSION" export KERNEL_INSTALL_MACHINE_ID="$MACHINE_ID" export KERNEL_INSTALL_BOOT_ROOT="$BOOT_ROOT" export KERNEL_INSTALL_LAYOUT="$layout" +export KERNEL_INSTALL_INITRD_GENERATOR="$initrd_generator" [ "$layout" = "bls" ] MAKE_ENTRY_DIR_ABS=$?