diff --git a/config/grub/grub.conf b/config/grub/grub.conf index c3f2ebddf..d71e0c6f6 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 diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index e323ee81f..5ca9693fd 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -52,7 +52,7 @@ cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-pae.conf # echo "" >> /boot/grub/grub.conf echo "title IPFire (PAE-Kernel)" >> /boot/grub/grub.conf -echo " kernel /vmlinuz-$KVER-ipfire-pae root=$ROOT rootdelay=10 panic=10 $MOUNT" >> /boot/grub/grub.conf +echo " kernel /vmlinuz-$KVER-ipfire-pae root=$ROOT panic=10 $MOUNT" >> /boot/grub/grub.conf echo " initrd /ipfirerd-$KVER-pae.img" >> /boot/grub/grub.conf echo " savedefault $ENTRY" >> /boot/grub/grub.conf # diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index d566405a0..d9bc9df6d 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -52,7 +52,7 @@ cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-xen.conf # echo "" >> /boot/grub/grub.conf echo "title IPFire (XEN-Kernel)" >> /boot/grub/grub.conf -echo " kernel /vmlinuz-$KVER-ipfire-xen root=$ROOT rootdelay=10 panic=10 console=xvc0 $MOUNT" >> /boot/grub/grub.conf +echo " kernel /vmlinuz-$KVER-ipfire-xen root=$ROOT panic=10 console=xvc0 $MOUNT" >> /boot/grub/grub.conf echo " initrd /ipfirerd-$KVER-xen.img" >> /boot/grub/grub.conf echo "# savedefault $ENTRY" >> /boot/grub/grub.conf #