webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-14 13:02:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add an emergency ramdisk with all storage drivers.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2008-08-01 21:53:51 +02:00
parent 8641715348
commit edd66ab648
3 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config/grub/grub.conf
View File

@@ -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

7
config/rootfiles/updater/update.sh
View File

@@ -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

9
src/install+setup/install/main.c
View File

@@ -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 */