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

QoS-Graphen wieder eingebaut.

Browse Source 
usbutils und which Paket gemacht.
unbenoetigte Apache-Module werden nicht geladen.
Net-SSLeay gefixt - DynDNS braucht das.
Alsa-Module werden geladen.
Java-paket verkleinert.
Sambactrl gefixt.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@652 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-06-30 17:21:34 +00:00
parent 99e6df8e99
commit 51f3b7f5af
21 changed files with 896 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,8 +177,7 @@ int main(int argc, char *argv[])
goto EXIT;
if (!unattended) {
rc = newtWinMenu("Language selection",
"Select the language you wish to use for the " NAME ".", 50, 5, 5, 8,
rc = newtWinMenu("Language selection", "Select the language you wish to use for the " NAME ".", 50, 5, 5, 8,
langnames, &choice, "Ok", NULL);
}
@@ -208,7 +207,6 @@ int main(int argc, char *argv[])
// Starting hardware detection
runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]);
runcommandwithstatus("/bin/probenic.sh install", ctr[TR_PROBING_HARDWARE]);
/* CDROM INSTALL */
if (installtype == CDROM_INSTALL) {
@@ -643,12 +641,8 @@ EXIT:
newtFinished();
if (!unattended) {
// Copy our scanned nics to the disk and lock because scan doesn't work in chroot
system("touch /harddisk/var/ipfire/ethernet/scan_lock");
system("cp -f /tmp/scanned_nics /harddisk/var/ipfire/ethernet/scanned_nics");
if (system("/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
printf("Unable to run setup.\n");
system("rm -f /harddisk/var/ipfire/ethernet/scan_lock");
}
if (system("/bin/umount /harddisk/proc"))

2
src/install+setup/install/probehw.sh
View File

@@ -14,6 +14,8 @@ for MODULE in $(kudzu -qps -t 30 | grep driver: | cut -d ' ' -f 2 | sort | uniq
echo " --> ecode: $?"
done
sleep 10
if [ $# -eq 0 ]; then
exit 0
fi

10
src/install+setup/install/probenic.sh
View File

@@ -1,11 +1,5 @@
#!/bin/sh
case "$1" in
install)
kudzu -qps -c NETWORK | egrep "desc|network.hwaddr|driver" > /tmp/scanned_nics 2>/dev/null
;;
"")
kudzu -qps -c NETWORK | egrep "desc|network.hwaddr|driver" > /var/ipfire/ethernet/scanned_nics 2>/dev/null
;;
esac
kudzu -qps -c NETWORK | egrep "desc|network.hwaddr|driver" > /var/ipfire/ethernet/scanned_nics 2>/dev/null
exit 0