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

Noch ein paar kleine Aenderungen wegen dem mkinitcpio...

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@566 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-05-19 12:19:35 +00:00
parent 81e974f362
commit aee3027d87
8 changed files with 13 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/grub/grub.conf
View File

@@ -6,30 +6,30 @@ gfxmenu /grub/message
title IPFire (1024x768)
root (hd0,0)
kernel /vmlinuz-ipfire root=ROOT panic=10 vga=791 splash=silent ro
initrd /initrd.splash
initrd /ipfirerd.img
savedefault 0
title IPFire (VESA)
root (hd0,0)
kernel /vmlinuz-ipfire root=ROOT panic=10 ro
initrd /initrd.splash
initrd /ipfirerd.img
savedefault 1
title IPFire SMP (1024x768)
root (hd0,0)
kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off vga=791 splash=silent ro
initrd /initrd.splash
initrd /ipfirerd-smp.img
savedefault 2
title IPFire SMP (VESA)
root (hd0,0)
kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off ro
initrd /initrd.splash
initrd /ipfirerd-smp.img
savedefault 3
title IPFire SMP-HT (Intel Pentium 4) (1024x768)
root (hd0,0)
kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht vga=791 splash=silent ro
initrd /initrd.splash
initrd /ipfirerd-smp.img
savedefault 4
title IPFire SMP-HT (Intel Pentium 4) (VESA)
root (hd0,0)
kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht ro
initrd /initrd.splash
initrd /ipfirerd-smp.img
savedefault 5

35
config/grub/scsigrub.conf
View File

@@ -1,35 +0,0 @@
timeout 10
default saved
foreground = 16064e
background = ffffff
gfxmenu /grub/message
title IPFire (1024x768)
root (hd0,0)
kernel /vmlinuz-ipfire root=ROOT panic=10 init=/linuxrc vga=791 splash=silent rw
initrd /ipfirerd.img
savedefault 0
title IPFire (VESA)
root (hd0,0)
kernel /vmlinuz-ipfire root=ROOT panic=10 init=/linuxrc rw
initrd /ipfirerd.img
savedefault 1
title IPFire SMP (1024x768)
root (hd0,0)
kernel /vmlinuz-ipfire-smp root=ROOT panic=10 init=/linuxrc acpi=off vga=791 splash=silent rw
initrd /ipfirerd-smp.img
savedefault 2
title IPFire SMP (VESA)
root (hd0,0)
kernel /vmlinuz-ipfire-smp root=ROOT panic=10 init=/linuxrc acpi=off rw
initrd /ipfirerd-smp.img
savedefault 3
title IPFire SMP (Intel Pentium 4) (1024x768)
root (hd0,0)
kernel /vmlinuz-ipfire-smp root=ROOT panic=10 init=/linuxrc acpi=ht vga=791 splash=silent rw
initrd /ipfirerd-smp.img
savedefault 4
title IPFire SMP (Intel Pentium 4) (VESA)
root (hd0,0)
kernel /vmlinuz-ipfire-smp root=ROOT panic=10 init=/linuxrc acpi=ht rw
initrd /ipfirerd-smp.img
savedefault 5

1
config/rootfiles/common/grub
View File

@@ -4,7 +4,6 @@ boot/grub/grub.conf
boot/grub/grubbatch
boot/grub/ipfire.xpm.gz
boot/grub/message
boot/grub/scsigrub.conf
boot/grub/stage1
boot/grub/stage2
#usr/bin/mbchk

4
lfs/Config
View File

@@ -167,9 +167,9 @@ define PAK
--file=/packagetmp.tar --exclude='#*'
cd / && tar -x -C /tmp -f /packagetmp.tar
rm -f /packagetmp.tar
-cd /tmp && tar cjvf /install/packages/package/files.tbz2 *
cd /tmp && tar cjvf /install/packages/package/files.tbz2 *
cd / && rm -rf /tmp/*
cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES
-cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES
cd /install/packages/package && tar cfj ../$(PROG)-$(VER)-$(PAK_VER).ipfire \
files.tbz2 install.sh uninstall.sh update.sh ROOTFILES
rm -rf /install/packages/package

2
lfs/installer
View File

@@ -62,6 +62,6 @@ $(TARGET) :
-DNAME='\"$(NAME)\"' -DSNAME='\"$(SNAME)\"' -DVERSION='\"$(VERSION)\"' \
-DSLOGAN='\"$(SLOGAN)\"' -DCONFIG_ROOT='\"$(CONFIG_ROOT)\"' -DKERNEL_VERSION='\"$(KVER)\"'"
cd $(DIR_APP)/install && install -v -m 0755 install probenic.sh \
probecntrl.sh probehw.sh installbootsplash.sh mountsource.sh mountdest.sh /install/initrd/bin
probehw.sh installbootsplash.sh mountsource.sh mountdest.sh /install/initrd/bin
@rm -rf $(DIR_APP)
@$(POSTBUILD)

1
lfs/mkinitcpio
View File

@@ -74,5 +74,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./install.sh ""
sed -i 's|^FILELIST=.*|FILELIST="$$(mktemp)"|g' /sbin/mkinitcpio
sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi sata filesystems"|g' /etc/mkinitcpio.conf
@rm -rf $(DIR_APP)
@$(POSTBUILD)

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

@@ -235,26 +235,7 @@ int main(int argc, char *argv[])
i++;
fprintf(flog, "Harddisk scan pass %i\n", i);
rc = mysystem("/bin/mountdest.sh");
fprintf(flog, "RC %d\n", rc);
if (rc == 0) { // Found IDE disk
scsi_disk = 0;
found = 1;
} else if (rc == 1) { // Found SCSI/USB/SATA disk
scsi_disk = 1;
found = 1;
} else { // No harddisk found
if (firstrun == 1) {
errorbox(ctr[TR_NO_HARDDISK]);
goto EXIT;
}
// Do this if the kudzu-scan fails...
runcommandwithstatus("/bin/probehw.sh deep-scan", ctr[TR_PROBING_HARDWARE]);
firstrun = 1;
}
/* switch (mysystem("/bin/mountdest.sh")) {
switch (mysystem("/bin/mountdest.sh") % 255) {
case 0: // Found IDE disk
scsi_disk = 0;
found = 1;
@@ -271,7 +252,7 @@ int main(int argc, char *argv[])
// Do this if the kudzu-scan fails...
runcommandwithstatus("/bin/probehw.sh deep-scan", ctr[TR_PROBING_HARDWARE]);
firstrun = 1;
} */
}
}
/*
@@ -584,7 +565,7 @@ int main(int argc, char *argv[])
/* Going to make our initrd... */
snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -v -g /boot/ipfirerd.img -k %s-ipfire", KERNEL_VERSION);
runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -v -g /boot/ipfirerd-smp.img -k %s-smp-ipfire", KERNEL_VERSION);
snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -v -g /boot/ipfirerd-smp.img -k %s-ipfire-smp", KERNEL_VERSION);
runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
sprintf(string, "root=%s3", hdparams.devnode_part_run);

19
src/install+setup/install/probecntrl.sh
View File

@@ -1,19 +0,0 @@
#!/bin/sh
echo "Probing for storage controllers"
for MODULE in $(hwinfo --usb --usb-ctrl --storage-ctrl | grep modprobe | awk '{ print $5 }' | tr -d \" | sort | uniq); do
if [ "${MODULE}" = "piix" ]; then
continue
fi
if grep -Eqe "^${MODULE} " /proc/modules; then
MODULES="${MODULES} --with=${MODULE}"
echo "Found: ${MODULE}"
fi
done
if [ -z "${MODULES}" ]; then
exit 1
else
echo "${MODULES}" > /tmp/cntrldriver
exit 0
fi