X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=chroot-script;h=3609a0149d783da0e5d65ebeb8a95963c781ec69;hb=b9035f63feb63dd73d737c37a5bc9ce48def343e;hp=1bd3abb3bb7a1871b1cb831e9ea5064478129085;hpb=d275bdfe5ba2b9abcf67687311110ae2dc5ac90f;p=grml-debootstrap.git diff --git a/chroot-script b/chroot-script index 1bd3abb..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" @@ -384,9 +384,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 +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