Merge remote-tracking branch 'origin/pr/254'

diff --git a/chroot-script b/chroot-script
index a077acd..3609a01 100755 (executable)
--- 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 (file)
--- 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 (file)
--- a/packages-arm64
+++ b/packages-arm64
@@ -9,7 +9,6 @@ file
 grub2-common
 grub-efi-arm64
 ifenslave
-initramfs-tools
 isc-dhcp-client
 less
 locales