[Devil-linux-commit] build/scripts/scripts camsource, 1.5, 1.6 motion, 1.3, 1.4 upgrade-config, 1.39, 1.40

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5434/scripts/scripts

Modified Files:
	camsource motion upgrade-config 
Log Message:
- updated alsa-driver-1.0.22
- updated alsa-lib-1.0.22
- updated alsa-tools-1.0.22
- updated alsa-utils-1.0.22
- updated coreutils-8.2
- updated loop-AES-v3.2h
- updated mdadm-3.1.1
- updated module-init-tools-3.11.1
- updated openldap-2.4.21
- updated openssh-5.3p1
- updated pcmciautils-016
- updated reiserfsprogs-3.6.21
- updated util-linux-ng-2.16.2
- closed bug #51 - ifconfig doesn't support IPv6


Index: motion
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/motion,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- motion	25 Jul 2005 17:16:58 -0000	1.3
+++ motion	26 Dec 2009 21:26:50 -0000	1.4
@@ -51,7 +51,7 @@
 		for MODULE in $MOTION_MODULES
 		do
 			echo Loading module $MODULE
-			modprobe -k $MODULE
+			modprobe $MODULE
 		done
 		# wait until modules are initialized
 		sleep 3

Index: upgrade-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/upgrade-config,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- upgrade-config	22 Nov 2009 14:13:25 -0000	1.39
+++ upgrade-config	26 Dec 2009 21:26:50 -0000	1.40
@@ -346,4 +346,10 @@
 cat $TMPD >> /etc/syslog-ng/syslog-ng.conf
 rm $TMPD
 
+#module-init-tools
+if [ -f /etc/modprobe.conf ]; then
+    mkdir -p /etc/modprobe.d
+    mv -f /etc/modprobe.conf /etc/modprobe.d/
+fi
+
 rm -fr $TMPD $RESULT $RAMDISKDIR/oldconfig

Index: camsource
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/camsource,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- camsource	25 Jul 2005 17:16:58 -0000	1.5
+++ camsource	26 Dec 2009 21:26:50 -0000	1.6
@@ -49,7 +49,7 @@
 		for MODULE in $CAMSOURCE_MODULES
 		do
 			echo Loading module $MODULE
-			modprobe -k $MODULE
+			modprobe $MODULE
 		done
 		# wait until modules are initialized
 		sleep 3