Add an emergency ramdisk with all storage drivers.

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 814916344a931303c9082e816aaaed81c6fd11ea..3cca7c046d73e0489534d6785fa0b1dcce076138 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -24,23 +24,28 @@ title IPFire (vesafb 1024x768, acpi=off)
   kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 vga=791 acpi=off MOUNT
   initrd /ipfirerd-KVER-smp.img
   savedefault 3
-title IPFire SMP/HT disabled
+title IPFire - Single CPU
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 4
-title IPFire SMP/HT disabled (vesafb 1024x768)
+title IPFire - Single CPU (vesafb 1024x768)
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 5
-title IPFire SMP/HT disabled (acpi=off)
+title IPFire - Single CPU (acpi=off)
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 6
-title IPFire SMP/HT disabled (vesafb 1024x768, acpi=off)
+title IPFire - Single CPU (vesafb 1024x768, acpi=off)
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 acpi=off MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 7
+title IPFire - Single CPU (emergency - all storage drivers)
+  root (hd0,0)
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
+  initrd /ipfirerd-KVER-emergency.img
+  savedefault 8

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index 0d37940f99d9753f49dd9ca1ee1f23d917b0c438..b89b701759be3158f7737054d0a4065dfeed7a69 100755 (executable)
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -79,6 +79,13 @@ echo "title Old Kernel" >> /boot/grub/grub.conf
 echo "  configfile /grub/grub-old.conf" >> /boot/grub/grub.conf
 sed -i "s|/vmlinuz-ipfire|/vmlinuz-$OLDKERNEL-ipfire|g" /boot/grub/grub-old.conf
 #
+# Made emergency - initramdisk
+#
+cp -f /etc/mkinitcpio.conf /etc/mkinitcpio.conf.org
+sed -i "s| autodetect | |g" /etc/mkinitcpio.conf
+mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img
+cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
+#
 # Made initramdisk
 #
 echo

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 852819b176bd606878d061896114a1705a0adcc4..fb394ce0c9f5ce7020e31528cc017947741ae8c0 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -503,6 +503,15 @@ int main(int argc, char *argv[])
 
        replace("/harddisk/boot/grub/grub.conf", "KVER", KERNEL_VERSION);
 
+       /* Build the emergency ramdisk with all drivers */
+       mysystem("cp -f /harddisk/etc/mkinitcpio.conf /harddisk/etc/mkinitcpio.conf.org");
+
+       replace("/harddisk/etc/mkinitcpio.conf", " autodetect ", " ");
+       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s-emergency.img -k %s-ipfire", KERNEL_VERSION, KERNEL_VERSION);
+       runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
+
+       mysystem("cp -f /harddisk/etc/mkinitcpio.conf.org /harddisk/etc/mkinitcpio.conf");
+
        /* mkinitcpio has a problem if ide and pata are included */
        if ( scsi_disk==1 ) {
            /* Remove the ide hook if we install sda */