From b9035f63feb63dd73d737c37a5bc9ce48def343e Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Wed, 22 Nov 2023 00:16:37 -0500 Subject: [PATCH] Avoid intermediary installation of initramfs-tools when using INITRD_GENERATOR=dracut. fixes https://github.com/grml/grml-debootstrap/issues/235 --- chroot-script | 3 +-- packages | 1 - packages-arm64 | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/chroot-script b/chroot-script index a077acd..3609a01 100755 --- a/chroot-script +++ b/chroot-script @@ -350,7 +350,7 @@ kernel() { KVER=$(get_kernel_version) if [ -n "$KVER" ] ; then # note: install busybox to be able to debug initramfs - KERNELPACKAGES="linux-image-$KVER linux-headers-$KVER busybox firmware-linux-free" + KERNELPACKAGES="linux-image-$KVER linux-headers-$KVER busybox firmware-linux-free $INITRD_GENERATOR" # only add firmware-linux if we have non-free as a component if expr "$COMPONENTS" : '.*non-free' >/dev/null ; then KERNELPACKAGES="$KERNELPACKAGES firmware-linux" @@ -600,7 +600,6 @@ initrd() { if [ -n "$INITRD" ] ; then echo "Generating initrd." if [ "$INITRD_GENERATOR" = 'dracut' ] ; then - DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL dracut # shellcheck disable=SC2086 dracut --no-hostonly --kver "$KERNELVER" --fstab --add-fstab /etc/fstab --force --reproducible $INITRD_GENERATOR_OPTS else diff --git a/packages b/packages index ae8bdd4..c961a81 100644 --- a/packages +++ b/packages @@ -8,7 +8,6 @@ dbus file grub-pc ifenslave -initramfs-tools isc-dhcp-client less locales diff --git a/packages-arm64 b/packages-arm64 index 2d530fd..f69c849 100644 --- a/packages-arm64 +++ b/packages-arm64 @@ -9,7 +9,6 @@ file grub2-common grub-efi-arm64 ifenslave -initramfs-tools isc-dhcp-client less locales -- 2.1.4