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

Fixed a bug in the lfs/vdradmin file Merge branch 'master' of

Browse Source 
git://git.ipfire.org/ipfire-2.x

Conflicts:
	config/rootfiles/packages/vdradmin
	lfs/vdradmin
	src/initscripts/init.d/vdradmin
This commit is contained in:
Stefan Schantl
2009-03-01 22:00:55 +01:00
parent c0b229ae77 7c328e6e60
commit 0f8a65cbe1
9 changed files with 292 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/initscripts/init.d/snort
View File

@@ -74,6 +74,7 @@ case "$1" in
IFACE=`/bin/cat /var/ipfire/red/iface 2>/dev/null | /usr/bin/tr -d '\012'`
sed -e "s/^Interface.*/Interface ${IFACE}/" /var/ipfire/guardian/guardian.conf > temp
mv temp /var/ipfire/guardian/guardian.conf
chown nobody.root /var/ipfire/guardian/guardian.conf
boot_mesg "Starting Guardian..."
loadproc /usr/local/bin/guardian.pl -c /var/ipfire/guardian/guardian.conf

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

@@ -90,7 +90,9 @@ int main(int argc, char *argv[])
newtInit();
newtCls();
/* Do usb detection first for usb keyboard */
newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
if (! (cmdfile = fopen("/proc/cmdline", "r")))
{
fprintf(flog, "Couldn't open commandline: /proc/cmdline\n");
@@ -104,8 +106,14 @@ int main(int argc, char *argv[])
}
}
// mysystem("/sbin/modprobe ide-generic");
// mysystem("/sbin/modprobe generic");
// Load ata-piix prior kudzu because kudzu use ata-generic for ich7
mysystem("/sbin/modprobe ata_piix");
// Starting hardware detection
runcommandwithstatus("/bin/probehw.sh", "Probing Hardware ...");
// Load common modules
mysystem("/sbin/modprobe ide-generic");
mysystem("/sbin/modprobe ide-cd");
mysystem("/sbin/modprobe ide-disk");
mysystem("/sbin/modprobe uhci-hcd");
@@ -138,12 +146,7 @@ int main(int argc, char *argv[])
ctr = langtrs[choice];
strcpy(shortlangname, shortlangnames[choice]);
newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
newtPushHelpLine(ctr[TR_HELPLINE]);
sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
// Starting hardware detection
runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]);
sprintf(message, ctr[TR_WELCOME], NAME);
newtWinMessage(title, ctr[TR_OK], message);

2
src/scripts/backupiso
View File

@@ -2,7 +2,7 @@
# FIXME: edit this lines before release
URL=http://download.ipfire.org/iso/
ISO=ipfire-2.3.i586-full.iso
ISO=ipfire-2.3.i586-full-core27.iso
#URL=http://www.rowie.at/ipfire/builds/v2.3test/Beta3/20081001-17uhr/
#ISO=ipfire-2.3-test.i586-full.iso