Skip to content

Commit

Permalink
Drop support for bsd4grml / NO_ADDONS_BSD4GRML
Browse files Browse the repository at this point in the history
We no longer ship bsd4grml via grml-live-grml (see
grml/grml-live-grml#11), and bsd4grml is so well
hidden inside Grml boot, that 2 out of 3 core devs didn't even find it. 8-)

(FTR: in BIOS boot with isolinux/syslinux, one needs to select the "Run
Bootloader Grub2" addon sub menu entry, and then under Addons -> "MirOS
bsd4grml (via loopback)" needs to be selected, related see
commit 438804c).

As this boot option was supported on legacy boot (as in BIOS /
Non-UEFI boot) only anyway, let's stop supporting it.

See grml/grml#211
  • Loading branch information
mika committed Dec 18, 2024
1 parent 6718bf8 commit c492657
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 52 deletions.
3 changes: 0 additions & 3 deletions etc/grml/grml-live.conf
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,6 @@
# Do you want to skip adding /boot/addons/ (from the template directory)?
# NO_ADDONS='1'

# Do you want to skip adding /boot/addons/bsd4grml/ (from the template directory)?
# NO_ADDONS_BSD4GRML='1'

# By default the ISO is created for hybrid boot, so you can either
# boot the CD using normal el torito mode or copy it to USB device
# *without* having to run grml2usb (like: 'dd if=grml.iso of=/dev/sdX')
Expand Down
17 changes: 1 addition & 16 deletions grml-live
Original file line number Diff line number Diff line change
Expand Up @@ -1272,7 +1272,7 @@ else
copy_addon_file memdisk /usr/lib/syslinux addons
fi

# copy only files so we can handle bsd4grml on its own
# copy only files and report which ones are installed
if [ -d "${TEMPLATE_DIRECTORY}/arch/${ARCH}/boot/addons" ] ; then
for file in "${TEMPLATE_DIRECTORY}/arch/${ARCH}/boot/addons/"* ; do
if [ -f "$file" ] ; then
Expand All @@ -1292,17 +1292,6 @@ else
fi
eend 0

if [ -n "$NO_ADDONS_BSD4GRML" ] ; then
log "Skipping installation of bsd4grml as requested via \$NO_ADDONS_BSD4GRML."
einfo "Skipping installation of bsd4grml as requested via \$NO_ADDONS_BSD4GRML."; eend 0
else
if [ -d "$TEMPLATE_DIRECTORY"/boot/addons/bsd4grml ] ; then
cp -a "${TEMPLATE_DIRECTORY}"/boot/addons/bsd4grml "$BUILD_OUTPUT"/boot/addons/
else
log "Missing addon file: bsd4grml"
ewarn "Missing addon file: bsd4grml" ; eend 0
fi
fi
fi # NO_ADDONS

# generate loopback.cfg config file without depending on grub's regexp module
Expand Down Expand Up @@ -1456,10 +1445,6 @@ else
fi
fi # amd64 or i386

if [ -e "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6 ]; then
sed -i "s/%RELEASE_INFO%/$RELEASE_INFO/" "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6
fi

DPKG_LIST="/var/log/fai/$HOSTNAME/last/dpkg.list" # the dpkg --list output of the chroot
if ! [ -r "$DPKG_LIST" ] ; then
ewarn "$DPKG_LIST could not be read, ignoring to store package information on ISO therefore."
Expand Down
33 changes: 0 additions & 33 deletions templates/boot/grub/addons.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -88,38 +88,5 @@ if [ "${grub_platform}" != "efi" ] ; then
linux16 /boot/addons/memdisk
initrd16 /boot/addons/balder10.imz
}

if [ ${iso_path} ] ; then
# assume loopback.cfg boot
menuentry "MirOS bsd4grml (via loopback)" {
multiboot /boot/addons/bsd4grml/ldbsd.com
module /boot/addons/bsd4grml/bsd.rd bsd
module /boot/addons/bsd4grml/loopback.0 boot.cfg
module /boot/addons/bsd4grml/loopback.1 boot.1
module /boot/addons/bsd4grml/loopback.2 boot.2
module /boot/addons/bsd4grml/loopback.3 boot.3
module /boot/addons/bsd4grml/loopback.4 boot.4
module /boot/addons/bsd4grml/loopback.5 boot.5
module /boot/addons/bsd4grml/loopback.6 boot.6
}
else
# assume grub.cfg boot
menuentry "MirOS bsd4grml (regular method)" {
multiboot /boot/addons/bsd4grml/ldbsd.com
}

menuentry "MirOS bsd4grml (fallback method)" {
multiboot /boot/addons/bsd4grml/ldbsd.com
module /boot/addons/bsd4grml/bsd.rd bsd.rd
module /boot/addons/bsd4grml/boot.1 boot.1
module /boot/addons/bsd4grml/boot.2 boot.2
module /boot/addons/bsd4grml/boot.3 boot.3
module /boot/addons/bsd4grml/boot.4 boot.4
module /boot/addons/bsd4grml/boot.5 boot.5
module /boot/addons/bsd4grml/boot.6 boot.6
module /boot/addons/bsd4grml/boot.cfg boot.cfg
module /boot/grub/grub.img grub.img
}
fi # iso_path
fi # efi mode
}

0 comments on commit c492657

Please sign in to comment.