Bugfixes:

* SCSI-SMP-Kernel vergessen.
  * scsigrub.conf war fehlerhaft und nicht komplett.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@202 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-07-06 20:51:35 +00:00
parent 6693216e1e
commit 7628469abd
2 changed files with 9 additions and 4 deletions

View File

@@ -5,21 +5,21 @@ background = ffffff
splashimage (hd0,0)/grub/ipfire.xpm.gz
title IPFire
root (hd0,0)
kernel /vmlinuz root=ROOT panic=10 init=/linuxrc acpi=off vga=719 splash=silent rw
kernel /vmlinuz root=ROOT panic=10 init=/linuxrc acpi=off vga=791 splash=silent rw
initrd /ipfirerd.img
savedefault
title IPFire SMP
root (hd0,0)
kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off vga=719 rw
kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off vga=791 splash=silent rw
initrd /ipfirerd-smp.img
savedefault
title IPFire (ACPI enabled)
root (hd0,0)
kernel /vmlinuz root=ROOT panic=10 init=/linuxrc vga=719 splash=silent rw
kernel /vmlinuz root=ROOT panic=10 init=/linuxrc vga=791 splash=silent rw
initrd /ipfirerd.img
savedefault
title IPFire SMP (ACPI HT enabled)
root (hd0,0)
kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=ht vga=719 splash=silent rw
kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=ht vga=791 splash=silent rw
initrd /ipfirerd-smp.img
savedefault

View File

@@ -954,9 +954,14 @@ RESTORE:
}
/* Set Bootsplash */
if ((handle = fopen("/scsidriver", "r")))
{
mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf >> /harddisk/boot/ipfirerd.img");
mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf >> /harddisk/boot/ipfirerd-smp.img");
}
else
{
mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf > /harddisk/boot/initrd.splash");
}
mysystem("/bin/chroot /harddisk /bin/umount -n /proc");
#endif
#ifdef __alpha__