Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

This commit is contained in:
Michael Tremer
2008-08-25 19:06:09 +00:00

View File

@@ -9,23 +9,28 @@ title IPFire
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 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
initrd /ipfirerd-KVER.img
savedefault 1
title IPFire (vesafb 1024x768)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
initrd /ipfirerd-KVER.img
savedefault 1
savedefault 2
title IPFire (acpi disabled)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
initrd /ipfirerd-KVER.img
savedefault 2
savedefault 3
title IPFire (single Processor)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 nosmp MOUNT
initrd /ipfirerd-KVER.img
savedefault 3
savedefault 4
title IPFire (all storage drivers)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
initrd /ipfirerd-KVER-emergency.img
savedefault 4
savedefault 5