QoS-Graphen wieder eingebaut.

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

src/initscripts/init.d/alsa

@@ -10,13 +10,20 @@
 . $rc_functions
 
 case "$1" in
+	start)
+		boot_mesg "Starting ALSA..."
+		modprobe snd_pcm_oss >/dev/null 2>&1 || failed=1
+		modprobe snd_mixer_oss >/dev/null 2>&1 || failed=1
+		(exit ${failed})
+		evaluate_retval
+		;;
 	stop)
 		boot_mesg "Stopping ALSA...    Saving volumes..."
 		loadproc /usr/sbin/alsactl store
 		;;
 
 	*)
-		echo "Usage: $0 stop"
+		echo "Usage: $0 (start|stop)"
 		exit 1
 		;;
 esac

src/install+setup/install/main.c

@@ -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"))

src/install+setup/install/probehw.sh

@@ -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

src/install+setup/install/probenic.sh

@@ -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

src/misc-progs/Makefile

@@ -11,7 +11,7 @@ SUID_PROGS = setdmzholes setportfw setfilters setxtaccess \
 	restartsyslogd logwatch openvpnctrl outgoingfwctrl \
 	restartwireless getipstat qosctrl launch-ether-wake \
 	redctrl extrahdctrl sambactrl upnpctrl tripwirectrl \
-	smartctrl clamavctrl pakfire
+	smartctrl clamavctrl pakfire mpfirectrl
 
 install : all
 	install -m 755  $(PROGS) /usr/local/bin
@@ -120,3 +120,6 @@ getipstat: getipstat.c setuid.o ../install+setup/libsmooth/varval.o
 
 pakfire: pakfire.c setuid.o ../install+setup/libsmooth/varval.o
 	$(COMPILE) -I../install+setup/libsmooth/ pakfire.c setuid.o ../install+setup/libsmooth/varval.o -o $@
+
+mpfirectrl: mpfirectrl.c setuid.o ../install+setup/libsmooth/varval.o
+	$(COMPILE) -I../install+setup/libsmooth/ mpfirectrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@

src/misc-progs/mpfirectrl.c

@@ -0,0 +1,40 @@
+/* This file is part of the IPFire Firewall.
+ *
+ * This program is distributed under the terms of the GNU General Public
+ * Licence.  See the file COPYING for details.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include "setuid.h"
+
+int main(int argc, char *argv[]) {
+	int i;
+	char command[1024];
+	char add[STRING_SIZE];
+	
+	if (!(initsetuid()))
+		exit(1);
+
+	snprintf(command, STRING_SIZE, "/var/ipfire/mpfire/bin/mpfire.pl");
+
+	for (i = 1; i < argc; i++) {
+                if (strstr(argv[i], "&&")){
+	    	    fprintf (stderr, "Bad Argument!\n");
+            	    exit (1);
+            	}
+		if (strstr(argv[i], "|")){
+		    fprintf (stderr, "Bad Argument!\n");
+		    exit (1);
+		}
+		sprintf(add, " %s", argv[i]);
+		strcat(command, add);
+	}
+	
+	return safe_system(command);
+}

src/misc-progs/sambactrl.c

@@ -177,9 +177,7 @@ return 0;
 if (strcmp(argv[1], "enable")==0)
 {
 safe_system("touch /var/ipfire/samba/enable");
-safe_system("/etc/rc.d/init.d/samba start ");
-safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc2.d/S50samba");
-safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc2.d/K50samba");
+safe_system("/etc/rc.d/init.d/samba start");
 safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc3.d/S50samba");
 safe_system("ln -snf /etc/rc.d/init.d/samba /etc/rc.d/rc3.d/K50samba");
 return 0;
@@ -189,8 +187,6 @@ if (strcmp(argv[1], "disable")==0)
 {
 safe_system("unlink /var/ipfire/samba/enable");
 safe_system("/etc/rc.d/init.d/samba stop");
-safe_system("unlink /etc/rc.d/rc2.d/S50samba");
-safe_system("unlink /etc/rc.d/rc2.d/K50samba");
 safe_system("unlink /etc/rc.d/rc3.d/S50samba");
 safe_system("unlink /etc/rc.d/rc3.d/K50samba");
 return 0;

src/paks/alsa/install.sh

@@ -4,5 +4,6 @@
 extract_files
 
 touch /etc/asound.state
+ln -sf  ../init.d/alsa /etc/rc.d/rc3.d/S65alsa
 ln -sf  ../init.d/alsa /etc/rc.d/rc0.d/K35alsa
 ln -sf  ../init.d/alsa /etc/rc.d/rc6.d/K35alsa