Noch zwei Netzwerkfixes...

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@778 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

src/initscripts/init.d/dnsmasq

@@ -21,7 +21,7 @@ case "${1}" in
 		
 		eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 		ARGS=
-		[ "$DOMAIN_NAME_GREEN" == "" ] && ARGS="-s $DOMAIN_NAME_GREEN "
+		[ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN "
 		[ -e "/var/ipfire/red/active" ] && ARGS+="-r /var/ipfire/red/resolv.conf"
 		
 		loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS

src/initscripts/init.d/network

@@ -17,14 +17,13 @@
 eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 
 init_networking() {
-
 	boot_mesg "Loading firewall modules into the kernel"
 	modprobe iptable_nat || failed=1
 	for i in $(find /lib/modules/$(uname -r) -name ip_conntrack*); do
-		modprobe $i || failed=1
+		modprobe $(basename $i | cut -d. -f1) || failed=1
 	done
 	for i in $(find /lib/modules/$(uname -r) -name ip_nat*); do
-		modprobe $i || failed=1
+		modprobe $(basename $i | cut -d. -f1) || failed=1
 	done
 	(exit ${failed})
 	evaluate_retval