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

diff --git a/config/grub/scsigrub.conf b/config/grub/scsigrub.conf
index 7aed9b688638a59aa83f4ddbc613fb90a6caa13e..4b8e72cbc5ccf3c7fdbebbc3802420b71bff6d5a 100644 (file)
--- a/config/grub/scsigrub.conf
+++ b/config/grub/scsigrub.conf
@@ -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

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 1330b4099b9f54bc04c05127031a8f42054dcb8d..990f942f624ad172a3f57e5257c92bf86e010f35 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -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__