Remove old grub support

Removed code to generate menu.lst in tftp root dir. grml2usb generates
grub config now and also takes care of live-media-path.

diff --git a/grub_cards b/grub_cards
deleted file mode 100644 (file)
index fa69788..0000000
--- a/grub_cards
+++ /dev/null
@@ -1,32 +0,0 @@
-3c503 3Com_Etherlink2 on
-3c503-shmem 3Com_Etherlink2 off
-3c503-aui 3Com_Etherlink2_AUI off
-3c507 3Com off
-3c509 3Com on
-3c529 3Com off
-3c595 3Com off
-3c90x 3Com on
-cs89x0 Crystal_Semiconductor off
-davicom DM9102/DM9009 off
-depca DE100/DE200 off
-eepro Intel_Ethernetexpress_Pro/10 off
-eepro100 Intel_Ethernetexpress_Pro/100 on
-epic100 SMC_83c170 on
-exos205 EXOS205 off
-ni5210 Racal-Interlan off
-lance Lance_PCNet/AMD_HomePNA off
-ne2100 Novell_NE2100/NE1500 off
-ni6510 Racal-Interlan off
-ni5010 Racal-Interlan off
-ne NE1000/2000_ISA off
-ns8390 NE2000_PCI_RTL8029 on
-wd WD8003/8013_SMC8216/8416 off
-otulip Old_tulip_clones off
-rtl8139 Realtek8139/SMC1211/D-Link_DFE530TX/DFE538TX on
-sis900 SIS900/SIS7016 on
-sk-g16 Schneider_koch_G16 off
-smc9000 SMC9000 off
-tiara Tiara/Fujitsu_Lancard off
-tulip Tulip/Tulip-clonse/Linksys/Intel_tulip/Compex on
-via-rhine Rhine-1/Rhine-2/Dlink_DFE-530TX on
-w89c840 Winbond_W89c840/Compex_RL100-ATX off

diff --git a/templates/grub-pxelinux_config b/templates/grub-pxelinux_config
index 069c756..694293e 100644 (file)
--- a/templates/grub-pxelinux_config
+++ b/templates/grub-pxelinux_config
@@ -17,13 +17,6 @@
 #
 # GLOBAL_README_END
 
-if grep -q live-media-path= /proc/cmdline 2>/dev/null ; then
-  live_media_path_="live-media-path=$(awk -F live-media-path= '{print $2}' /proc/cmdline | awk '{print $1}')"
-fi
-if [ ! -d /live/image/boot ] && [ ! -d /lib/live/mount/medium/boot ] ; then
-  live_media_path_="live-media-path=/"
-fi
-
 # default boot arguments used for both grub and pxelinux
 if [ -e "$MOUNT_POINT_" ]; then
     default_boot_args_="root=/dev/nfs rw nfsroot=$IP_:$MOUNT_POINT_ \
@@ -34,68 +27,9 @@ init=/etc/init nfsdir=$IP_:$MOUNT_POINT_ nodhcp noprompt noeject \
 apm=power-off nomce"
 fi
 
-# special boot arguments required by grub
-grub_def_boot_args_="/vmlinuz $default_boot_args_ $live_media_path_"
-
 # special boot arguments required by pxelinux
 pxe_def_boot_args_="$default_boot_args_"
 
-# default arguments for framebuffer console
-def_fb_args_="vga=791"
-no_fb_args_="vga=normal"
-
-###
-## create grub config
-###
-
-cat >"$TFTPD_DATA_DIR_/menu.lst" <<EOT
-default=0
-timeout=10
-title GRML
-  root (nd)
-  kernel $grub_def_boot_args_ $def_fb_args_ $BOOT_ARGS_
-  initrd /initrd.img
-
-title GRML no framebuffer
-  root (nd)
-  kernel $grub_def_boot_args_ $no_fb_args_ $BOOT_ARGS_
-
-title GRML small
-  root (nd)
-  kernel $grub_def_boot_args_ small $def_fb_args_ $BOOT_ARGS_
-  initrd /initrd.img
-
-title GRML small nofb
-  root (nd)
-  kernel $grub_def_boot_args_ small $no_fb_args_ $BOOT_ARGS_
-  initrd /initrd.img
-
-title GRML debuginit
-  root (nd)
-  kernel $grub_def_boot_args_ debuginitrd $def_fb_args_ $BOOT_ARGS_
-  initrd /initrd.img
-
-title GRML debuginit nofb
-  root (nd)
-  kernel $grub_def_boot_args_ debuginitrd $no_fb_args_ $BOOT_ARGS_
-  initrd /initrd.img
-
-title GRML rescue
-  root (nd)
-  kernel $grub_def_boot_args_ $no_fb_args_
-  initrd /initrd.img
-
-title memtest
-  root (nd)
-  kernel /memtest
-
-title Reload config
-  configfile (nd)/menu.lst
-EOT
-
-ret_=$?
-
-
 ###
 ## create pxelinux config
 ###