X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Fgrub%2Fgrub.conf;h=d71e0c6f662b33a7a7a244bef0d701653610b2eb;hp=c3f2ebddf817de7f0707b493736add6d0002e564;hb=1a10fcdcec6d396e339d1b91e924f31e1cfd3f6f;hpb=492b2601788ccca269986c55a0b090ccbf876498 diff --git a/config/grub/grub.conf b/config/grub/grub.conf index c3f2ebddf8..d71e0c6f66 100644 --- a/config/grub/grub.conf +++ b/config/grub/grub.conf @@ -11,31 +11,31 @@ splashimage (hd0,0)/grub/ipfire.xpm.gz #terminal --timeout=1 serial console title IPFire root (hd0,0) - kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT + kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 MOUNT initrd /ipfirerd-KVER.img savedefault 0 title IPFire (vesafb 640x480) root (hd0,0) - kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=785 MOUNT + kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=785 MOUNT initrd /ipfirerd-KVER.img savedefault 1 title IPFire (vesafb 800x600) root (hd0,0) - kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=788 MOUNT + kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=788 MOUNT initrd /ipfirerd-KVER.img savedefault 2 title IPFire (vesafb 1024x768) root (hd0,0) - kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT + kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=791 MOUNT initrd /ipfirerd-KVER.img savedefault 3 title IPFire (acpi disabled) root (hd0,0) - kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT + kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 acpi=off MOUNT initrd /ipfirerd-KVER.img savedefault 4 title IPFire (single Processor) root (hd0,0) - kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 nosmp MOUNT + kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 nosmp MOUNT initrd /ipfirerd-KVER.img savedefault 5