grub: Don't install legacy configuration file.

diff --git a/pkgs/core/grub/grub.conf b/pkgs/core/grub/grub.conf
deleted file mode 100644 (file)
index df7481f..0000000
--- a/pkgs/core/grub/grub.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-timeout 10
-default saved
-#serial --unit=0 --speed=9600
-foreground = 6d6963
-background = ffffff
-#hiddenmenu
-splashimage (hd0,0)/grub/splash.xpm.gz
-title IPFire (1024x768)
-  root (hd0,0)
-  kernel /vmlinuz-ipfire root=ROOT panic=10 vga=791 @SERIAL@ MOUNT
-  initrd /ipfirerd.img
-  savedefault 0
-title IPFire (VESA)
-  root (hd0,0)
-  kernel /vmlinuz-ipfire root=ROOT panic=10 @SERIAL@ MOUNT
-  initrd /ipfirerd.img
-  savedefault 1
-title IPFire SMP (1024x768)
-  root (hd0,0)
-  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off vga=791 @SERIAL@ MOUNT
-  initrd /ipfirerd-smp.img
-  savedefault 2
-title IPFire SMP (VESA)
-  root (hd0,0)
-  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off @SERIAL@ MOUNT
-  initrd /ipfirerd-smp.img
-  savedefault 3
-title IPFire SMP-HT (Intel Pentium 4) (1024x768)
-  root (hd0,0)
-  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht vga=791 @SERIAL@ MOUNT
-  initrd /ipfirerd-smp.img
-  savedefault 4
-title IPFire SMP-HT (Intel Pentium 4) (VESA)
-  root (hd0,0)
-  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht @SERIAL@ MOUNT
-  initrd /ipfirerd-smp.img
-  savedefault 5

diff --git a/pkgs/core/grub/grub.nm b/pkgs/core/grub/grub.nm
index f49f71ae1a851a8f491cc85c66b8ef4134139dd3..b63f53b687242b57a22b911c131a7d464cd4a29c 100644 (file)
--- a/pkgs/core/grub/grub.nm
+++ b/pkgs/core/grub/grub.nm
@@ -59,7 +59,5 @@ define STAGE_INSTALL
        sed -e "s/pkgdatadir/pkglibdir/g" -i $(BUILDROOT)/usr/sbin/grub-install
 
        mkdir -pv $(BUILDROOT)/boot/grub
-       for i in $(DIR_SOURCE)/{grub.conf,splash.xpm.gz}; do \
-           cp -vf $$i $(BUILDROOT)/boot/grub; \
-       done
+       cp -vf $(DIR_SOURCE)/splash.xpm.gz $(BUILDROOT)/boot/grub
 endef