Geaendert:

[ipfire-2.x.git] / config / grub / grub.conf

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 8c2152caa665fcefdb5827c0560b5fd3e5fded92..ff9af0b3c606c309ec8ececb48d56d2ce3e188b4 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -8,14 +8,9 @@ title IPFire (1024x768)
   kernel /vmlinuz root=ROOT panic=10 acpi=off vga=791 splash=silent ro
   initrd /initrd.splash
   savedefault
-title IPFire (800x600)
+title IPFire (640x480)
   root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 acpi=off vga=788 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire (text)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 acpi=off ro
+  kernel /vmlinuz root=ROOT panic=10 acpi=off vga=785 splash=silent ro
   initrd /initrd.splash
   savedefault
 title IPFire SMP (1024x768)
@@ -23,14 +18,9 @@ title IPFire SMP (1024x768)
   kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=791 splash=silent ro
   initrd /initrd.splash
   savedefault
-title IPFire SMP (800x600)
-  root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=788 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire SMP (text)
+title IPFire SMP (640x480)
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off ro
+  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=785 splash=silent ro
   initrd /initrd.splash
   savedefault
 title IPFire (ACPI enabled) (1024x768)
@@ -38,14 +28,9 @@ title IPFire (ACPI enabled) (1024x768)
   kernel /vmlinuz root=ROOT panic=10 vga=791 splash=silent ro
   initrd /initrd.splash
   savedefault
-title IPFire (ACPI enabled) (800x600)
+title IPFire (ACPI enabled) (640x480)
   root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 vga=788 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire (ACPI enabled) (text)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 ro
+  kernel /vmlinuz root=ROOT panic=10 vga=785 splash=silent ro
   initrd /initrd.splash
   savedefault
 title IPFire SMP (ACPI HT enabled) (1024x768)
@@ -53,13 +38,8 @@ title IPFire SMP (ACPI HT enabled) (1024x768)
   kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=791 splash=silent ro
   initrd /initrd.splash
   savedefault
-title IPFire SMP (ACPI HT enabled) (800x600)
-  root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=788 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire SMP (ACPI HT enabled) (text)
+title IPFire SMP (ACPI HT enabled) (640x480)
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht ro
+  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=785 splash=silent ro
   initrd /initrd.splash
   savedefault