Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid installing initramfs-tools with INITRD_GENERATOR=dracut #236

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions chroot-script
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
debconf-set-selections < /etc/debootstrap/debconf-selections
}

if [ "$PACKAGES" = 'yes' ] ; then

Check warning on line 263 in chroot-script

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap

[shellcheck] reported by reviewdog 🐶 Possible misspelling: PACKAGES may not be assigned. Did you mean KPACKAGE? [SC2153](https://github.com/koalaman/shellcheck/wiki/SC2153) Raw Output: ./chroot-script:263:9:info:Possible misspelling: PACKAGES may not be assigned. Did you mean KPACKAGE? [SC2153](https://github.com/koalaman/shellcheck/wiki/SC2153)
PACKAGES_FILE="/etc/debootstrap/packages"

if [ "$ARCH" = 'arm64' ]; then
Expand Down Expand Up @@ -350,7 +350,7 @@
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 @@
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