webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-25 10:22:59 +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

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