Remove grub1 (binaries and support for it)

diff --git a/debian/copyright b/debian/copyright
index 28504c9..143a884 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,11 +9,6 @@ Copyright:
 
     © 2007++ by Michael Prokop <mika@grml.org>
 
-    Copyright of /usr/share/grml-live/i386_files/boot/grub/splash.xpm.gz by
-    Robin Bakels <robin@crondor.net>, which is licensed under "GPL v2 or higher"
-    and hase been taken from Debian package grub-splashimages
-    (file /boot/grub/splashimages/fiesta.xpm.gz).
-
 License:
 
     This package is free software; you can redistribute it and/or modify
@@ -30,13 +25,6 @@ License:
     along with this package; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-License information for the grub files shipped as
-/usr/share/grml-live/templates/boot/grub/:
-
-   Extracted from the Debian packages grub2, grub-pc and grub-common.
-   Copyright: 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc
-   License: GPL-3+
-
 License information for the syslinux files shipped as
 /usr/share/grml-live/templates/boot/isolinux/:
 

diff --git a/grml-live b/grml-live
index b7d59b4..2369cac 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -885,38 +885,10 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
           fi
        fi
 
-       # jump back to grub from bsd4grml (/boot/grub/stage2):
-       GRUB_LEGACY=stage2
-
        if [ -e "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6 ]; then
-          if [ -e "$BUILD_OUTPUT"/boot/grub/core.img ]; then
-             GRUB_VERSION=2
-          else
-             GRUB_VERSION=1
-          fi
-
-          for file in "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6 \
-                      "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.cfg \
-                      "$BUILD_OUTPUT"/boot/isolinux/*.cfg \
-                      "$BUILD_OUTPUT"/boot/grub/grub.cfg \
-                      "$BUILD_OUTPUT"/boot/grub/menu.lst ; do
-              if [ -e "$file" ] ; then
-                sed -i -e "s!%GRUB_VERSION%!$GRUB_VERSION!g" \
-                       -e "s!%GRUB_LEGACY%!$GRUB_LEGACY!g" "$file"
-              fi
-          done
-
           sed -i "s/%RELEASE_INFO%/$GRML_NAME $VERSION - $RELEASENAME/" "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6
        fi
 
-       if [ -e "$BUILD_OUTPUT"/boot/grub/$GRUB_LEGACY ]; then
-          sed -i "s/%GRUB_LEGACY%/$GRUB_LEGACY/g" "$BUILD_OUTPUT"/boot/grub/menu.lst
-          sed -i "s/%GRUB_LEGACY%/$GRUB_LEGACY/g" "$BUILD_OUTPUT"/boot/grub/grub.cfg
-       elif [ -e "$BUILD_OUTPUT"/boot/grub/menu.lst -a -e "$BUILD_OUTPUT"/boot/grub/grub.cfg ] ; then
-          sed -i "/%GRUB_LEGACY%/d" "$BUILD_OUTPUT"/boot/grub/menu.lst
-          sed -i "/%GRUB_LEGACY%/d" "$BUILD_OUTPUT"/boot/grub/grub.cfg
-       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."
@@ -1044,8 +1016,6 @@ fi
 
 if [ "$BOOT_METHOD" = "isolinux" ] ; then
    BOOT_ARGS="-no-emul-boot -boot-load-size 4 -boot-info-table -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat"
-elif [ "$BOOT_METHOD" = "grub" ] ; then
-   BOOT_ARGS="-no-emul-boot -boot-load-size 4 -boot-info-table -b boot/grub/stage2"
 elif [ "$BOOT_METHOD" = "grub2" ] ; then
    BOOT_ARGS="-no-emul-boot -boot-load-size 4 -b boot/grub/toriboot.bin"
 fi

diff --git a/templates/boot/addons/bsd4grml/boot.6 b/templates/boot/addons/bsd4grml/boot.6
index df846db..122520d 100644 (file)
--- a/templates/boot/addons/bsd4grml/boot.6
+++ b/templates/boot/addons/bsd4grml/boot.6
@@ -1,9 +1,8 @@
 # $MirOS: src/distrib/common/grml/boot.6,v 1.4 2009/10/29 00:17:37 tg Exp $
 #
 echo
-echo Switching to GNU GRUB %GRUB_VERSION% for booting
+echo Switching to GNU GRUB for booting
 echo into %RELEASE_INFO%
 echo
-macro grub1 machine exec grub /boot/grub/stage2
 macro grub2 machine exec grub /boot/grub/core.img
-grub%GRUB_VERSION%
+grub2

diff --git a/templates/boot/addons/bsd4grml/boot.cfg b/templates/boot/addons/bsd4grml/boot.cfg
index f805bfd..cb17a24 100644 (file)
--- a/templates/boot/addons/bsd4grml/boot.cfg
+++ b/templates/boot/addons/bsd4grml/boot.cfg
@@ -2,9 +2,7 @@
 #
 set image /boot/addons/bsd4grml/bsd.rd
 set timeout 12
-macro grub1 machine exec grub /boot/grub/stage2
-macro grub2 machine exec grub /boot/grub/core.img
-macro grml grub%GRUB_VERSION%
+macro grml machine exec grub /boot/grub/core.img
 macro slx machine exec dos
 echo
 echo ==================================================================

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index 1dec2de..996b15b 100644 (file)
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -77,7 +77,6 @@ else
         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_LEGACY% %GRUB_LEGACY%
         module      /boot/grub/core.img core.img
     }
 fi

diff --git a/templates/boot/grub/menu.lst b/templates/boot/grub/menu.lst
deleted file mode 100644 (file)
index 11d58d8..0000000
--- a/templates/boot/grub/menu.lst
+++ /dev/null
@@ -1,84 +0,0 @@
-# menu.lst - See: grub(8), info grub, update-grub(8)
-# grub-install(8), grub-floppy(8),
-# grub-md5-crypt, /usr/share/doc/grub
-# and /usr/share/doc/grub-doc/.
-
-# misc options:
-timeout 30
-# color red/blue green/black
-splashimage=/boot/grub/splash.xpm.gz
-foreground  = 000000
-background  = FFCC33
-
-# define entries:
-title %GRML_NAME% %VERSION% - Default boot (using 1024x768 framebuffer)
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% nomce 
-initrd /boot/%SHORT_NAME%/initrd.gz
-
-title %GRML_NAME% %VERSION% - disable framebuffer
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live bootid=%BOOTID% nomce radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset 
-initrd /boot/%SHORT_NAME%/initrd.gz
-
-title %GRML_NAME% %VERSION% - disable Kernel Mode Setting
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off quiet initrd=initrd.gz boot=live bootid=%BOOTID% nomce radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset vga=791 
-initrd /boot/%SHORT_NAME%/initrd.gz
-
-title %GRML_NAME% %VERSION% - with 1280x1024 framebuffer
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=794 quiet initrd=initrd.gz boot=live bootid=%BOOTID% nomce 
-initrd /boot/%SHORT_NAME%/initrd.gz
-
-title %GRML_NAME% %VERSION% - with 800x600 framebuffer
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=788 quiet initrd=initrd.gz boot=live bootid=%BOOTID% nomce 
-initrd /boot/%SHORT_NAME%/initrd.gz
-
-title %GRML_NAME% %VERSION% - failsafe boot
-kernel /boot/%SHORT_NAME%/linux26 vga=normal boot=live bootid=%BOOTID% noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nodmraid nolvm noresume selinux=0 edd=off 
-initrd /boot/%SHORT_NAME%/initrd.gz
-
-title %GRML_NAME% %VERSION% - debug mode
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 verbose debug=vc initrd=initrd.gz boot=live bootid=%BOOTID% initcall_debug nomce 
-initrd /boot/%SHORT_NAME%/initrd.gz
-
-title %GRML_NAME% %VERSION% - copy grml squashfs file to RAM
-kernel /boot/%SHORT_NAME%/linux26 toram=%SQUASHFS_NAME% apm=power-off vga=791 quiet boot=live bootid=%BOOTID% nomce 
-initrd /boot/%SHORT_NAME%/initrd.gz
-
-title %GRML_NAME% %VERSION% - copy medium to RAM
-kernel /boot/%SHORT_NAME%/linux26 toram apm=power-off vga=791 quiet boot=live bootid=%BOOTID% nomce 
-initrd /boot/%SHORT_NAME%/initrd.gz
-
-title %GRML_NAME% %VERSION% - grml2hd - install grml to local harddisk [adjust it!]
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% nomce BOOT_IMAGE=grml2hd grml2hd partition=/dev/ice1 mbr=/dev/ice user=grml filesystem=ext3
-initrd /boot/%SHORT_NAME%/initrd.gz
-
-title %GRML_NAME% %VERSION% - forensic mode
-kernel /boot/%SHORT_NAME%/linux26 vga=791 nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live bootid=%BOOTID% 
-initrd /boot/%SHORT_NAME%/initrd.gz
-
-title %GRML_NAME% %VERSION% - serial console mode
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live bootid=%BOOTID% nomce console=tty1 console=ttyS0,9600n8 
-initrd /boot/%SHORT_NAME%/initrd.gz
-
-title Run memtest86+
-kernel /boot/addons/memtest
-
-title Boot FreeDOS
-kernel /boot/addons/memdisk
-initrd /boot/addons/balder10.imz
-
-title MirOS bsd4grml (regular method)
-kernel /boot/addons/bsd4grml/ldbsd.com
-
-title MirOS bsd4grml (fallback method)
-kernel /boot/addons/bsd4grml/ldbsd.com
-modulenounzip /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
-modulenounzip /boot/grub/%GRUB_LEGACY% %GRUB_LEGACY%
-modulenounzip /boot/grub/core.img core.img
-

diff --git a/templates/boot/grub/splash.xpm.gz b/templates/boot/grub/splash.xpm.gz
deleted file mode 100644 (file)
index 9c34906..0000000
Binary files a/templates/boot/grub/splash.xpm.gz and /dev/null differ

diff --git a/templates/boot/grub/stage2 b/templates/boot/grub/stage2
deleted file mode 100644 (file)
index a726b51..0000000
Binary files a/templates/boot/grub/stage2 and /dev/null differ

diff --git a/templates/boot/isolinux/addon_15_grub1.cfg b/templates/boot/isolinux/addon_15_grub1.cfg
deleted file mode 100644 (file)
index 6fdcdc2..0000000
--- a/templates/boot/isolinux/addon_15_grub1.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-label grub1
-  menu label Run Bootloader Grub^1
-  kernel /boot/addons/bsd4grml/ldbsd.com
-  append echo Loading GRUB...`machine exec grub /boot/grub/%GRUB_LEGACY%
-
-  text help
-                                        Start Bootloader Grub (version 1).
-  endtext
-