Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/pr/254'
Browse files Browse the repository at this point in the history
  • Loading branch information
mika committed Dec 7, 2023
2 parents f4cd240 + b9035f6 commit 82858a8
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 4 deletions.
3 changes: 1 addition & 2 deletions chroot-script
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion packages
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ dbus
file
grub-pc
ifenslave
initramfs-tools
isc-dhcp-client
less
locales
Expand Down
1 change: 0 additions & 1 deletion packages-arm64
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ file
grub2-common
grub-efi-arm64
ifenslave
initramfs-tools
isc-dhcp-client
less
locales
Expand Down

0 comments on commit 82858a8

Please sign in to comment.