X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=chroot-script;h=52772400046ca23ddd9f29aff4d546e7a9e068c5;hb=refs%2Ftags%2Fv0.105;hp=1bd3abb3bb7a1871b1cb831e9ea5064478129085;hpb=511ca11ea437116522463053718df41c761e8a51;p=grml-debootstrap.git diff --git a/chroot-script b/chroot-script index 1bd3abb..5277240 100755 --- a/chroot-script +++ b/chroot-script @@ -349,8 +349,7 @@ kernel() { $APTUPDATE 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 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" @@ -384,9 +383,6 @@ passwords() return 0 fi - echo "Activating shadow passwords." - shadowconfig on - CHPASSWD_OPTION= if chpasswd --help 2>&1 | grep -q -- '-m,' ; then CHPASSWD_OPTION='-m' @@ -603,7 +599,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