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

SMP Kernel now default

Browse Source 
Changed alias order of SATA AHCI modul
This commit is contained in:
Arne Fitzenreiter
2008-07-21 19:28:19 +02:00
parent b9a5bed1de
commit ceba6fdfeb
4 changed files with 28 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
config/grub/grub.conf
View File

@@ -6,41 +6,41 @@ background = ffffff
splashimage (hd0,0)/grub/ipfire.xpm.gz
title IPFire
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
initrd /ipfirerd-KVER.img
kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 MOUNT
initrd /ipfirerd-KVER-smp.img
savedefault 0
title IPFire (vesafb 1024x768)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
initrd /ipfirerd-KVER.img
kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
initrd /ipfirerd-KVER-smp.img
savedefault 1
title IPFire (acpi=off)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
initrd /ipfirerd-KVER.img
kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
initrd /ipfirerd-KVER-smp.img
savedefault 2
title IPFire (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 3
title IPFire SMP/HT
root (hd0,0)
kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 MOUNT
initrd /ipfirerd-KVER-smp.img
savedefault 4
title IPFire SMP/HT (vesafb 1024x768)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
initrd /ipfirerd-KVER-smp.img
savedefault 5
title IPFire SMP/HT (acpi=off)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
initrd /ipfirerd-KVER-smp.img
savedefault 6
title IPFire SMP/HT (vesafb 1024x768, acpi=off)
root (hd0,0)
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
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)
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)
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)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 acpi=off MOUNT
initrd /ipfirerd-KVER.img
savedefault 7

4
config/install/rc
View File

@@ -32,10 +32,6 @@ ln -s /proc/kcore /dev/core
echo "Starting syslogd"
syslogd -O /dev/tty4
echo "Loading scsi_mod & libata"
/sbin/modprobe scsi_mod
/sbin/modprobe libata
echo "Starting udev daemon"
/sbin/udevd --daemon
/sbin/udevtrigger

4
lfs/initrd
View File

@@ -82,9 +82,9 @@ $(TARGET) :
-b /install/initrd $(KVER)-ipfire
# Change priority of pata module
cd /install/initrd/lib/modules/$(KVER)-ipfire && grep "# \|ata" \
cd /install/initrd/lib/modules/$(KVER)-ipfire && grep "# \|ata\|ahci" \
modules.alias > modules.alias.tmp
cd /install/initrd/lib/modules/$(KVER)-ipfire && grep -v "# \|ata" \
cd /install/initrd/lib/modules/$(KVER)-ipfire && grep -v "# \|ata\|ahci" \
modules.alias >> modules.alias.tmp
cd /install/initrd/lib/modules/$(KVER)-ipfire && mv -f \
modules.alias.tmp modules.alias

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

@@ -119,11 +119,6 @@ int main(int argc, char *argv[])
mysystem("/sbin/modprobe iso9660"); // CDROM
mysystem("/sbin/modprobe ext2"); // Boot patition
mysystem("/sbin/modprobe vfat"); // USB key
// AHCI must be loaded after the filesystems
// or it find no partitions
mysystem("/sbin/modprobe ahci"); // SATA AHCI Host controller
/* German is the default */
for (choice = 0; langnames[choice]; choice++)