From 4deb6e8e1b4ddb29e7c1725729267b589eb404d0 Mon Sep 17 00:00:00 2001 From: Daniel Winzen Date: Sun, 3 Jul 2022 14:07:10 +0200 Subject: [PATCH] Add option to pass extra options to initrd generator --- chroot-script | 4 ++-- config | 4 ++++ grml-debootstrap | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/chroot-script b/chroot-script index 25bd600..cba0428 100755 --- a/chroot-script +++ b/chroot-script @@ -576,9 +576,9 @@ initrd() { echo "Generating initrd." if [ "$INITRD_GENERATOR" = 'dracut' ] ; then DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL dracut - dracut -N --kver "$KERNELVER" --fstab --add-fstab /etc/fstab --force + dracut -N --kver "$KERNELVER" --fstab --add-fstab /etc/fstab --force $INITRD_GENERATOR_OPTS else - update-initramfs -c -t -k "$KERNELVER" + update-initramfs -c -t -k "$KERNELVER" $INITRD_GENERATOR_OPTS fi fi } diff --git a/config b/config index 107ef1a..68850cc 100644 --- a/config +++ b/config @@ -212,6 +212,10 @@ # Default: 'initramfs-tools' # INITRD_GENERATOR='initramfs-tools' +# Pass extra options to the selected initrd generator +# Default: no default +# INITRD_GENERATOR_OPTS='-v' + # If the specified file exists its content will be displayed at the end of the # installation process. # Useful for checking for errors and display warning message. diff --git a/grml-debootstrap b/grml-debootstrap index 2ed2964..e331a2c 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -64,6 +64,7 @@ MNTPOINT="/mnt/debootstrap.$$" [ -n "$HOSTNAME" ] || HOSTNAME='grml' [ -n "$INITRD" ] || INITRD='yes' [ -n "$INITRD_GENERATOR" ] || INITRD_GENERATOR='initramfs-tools' +[ -n "$INITRD_GENERATOR_OPTS" ] || INITRD_GENERATOR_OPTS='' [ -n "$INSTALL_NOTES" ] || INSTALL_NOTES='/etc/debootstrap/install_notes' [ -n "$LOCALES" ] || LOCALES='yes' [ -n "$MIRROR" ] || MIRROR="$FALLBACK_MIRROR" @@ -1693,6 +1694,7 @@ preparechroot() { [ -n "$HOSTNAME" ] && echo "HOSTNAME='$(sed "s,','\\\\'',g" <<<"${HOSTNAME}")'" >> "$CHROOT_VARIABLES" [ -n "$INITRD" ] && echo "INITRD='$(sed "s,','\\\\'',g" <<<"${INITRD}")'" >> "$CHROOT_VARIABLES" [ -n "$INITRD_GENERATOR" ] && echo "INITRD_GENERATOR='$(sed "s,','\\\\'',g" <<<"${INITRD_GENERATOR}")'" >> "$CHROOT_VARIABLES" + [ -n "$INITRD_GENERATOR_OPTS" ] && echo "INITRD_GENERATOR_OPTS='$(sed "s,','\\\\'',g" <<<"${INITRD_GENERATOR_OPTS}")'" >> "$CHROOT_VARIABLES" [ -n "$INSTALL_NOTES" ] && echo "INSTALL_NOTES='$(sed "s,','\\\\'',g" <<<"${INSTALL_NOTES}")'" >> "$CHROOT_VARIABLES" [ -n "$ISODIR" ] && echo "ISODIR='$(sed "s,','\\\\'',g" <<<"${ISO}")'" >> "$CHROOT_VARIABLES" [ -n "$ISO" ] && echo "ISO='$(sed "s,','\\\\'',g" <<<"${ISO}")'" >> "$CHROOT_VARIABLES" -- 2.1.4