- move networking init script away from skel-root

make/target-rootfs.mk

@@ -50,8 +50,6 @@ endif
 		rm -rf tmp; ln -sf /tmp tmp
 	$(CD) $(TARGET_DIR)/etc; \
 		ln -sf /proc/mounts mtab
-	$(CD) $(TARGET_DIR)/etc/init.d; \
-		ln -sf networking K99networking
 ifeq ($(BOXSERIES), hd2)
 	$(CD) $(TARGET_DIR)/etc; \
 		ln -sf /var/etc/exports exports; \

make/target-scripts.mk

@@ -14,6 +14,7 @@ init-scripts: \
 	$(TARGET_DIR)/etc/init.d/fstab \
 	$(TARGET_DIR)/etc/init.d/hostname \
 	$(TARGET_DIR)/etc/init.d/inetd \
+	$(TARGET_DIR)/etc/init.d/networking \
 	$(TARGET_DIR)/etc/init.d/swap \
 	$(TARGET_DIR)/etc/init.d/syslogd
 
@@ -59,6 +60,10 @@ $(TARGET_DIR)/etc/init.d/inetd:
 	ln -sf inetd $(TARGET_DIR)/etc/init.d/S53inetd
 	ln -sf inetd $(TARGET_DIR)/etc/init.d/K80inetd
 
+$(TARGET_DIR)/etc/init.d/networking:
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/networking.init $@
+	ln -sf networking $(TARGET_DIR)/etc/init.d/K99networking
+
 $(TARGET_DIR)/etc/init.d/swap:
 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
 	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/swap.init $@

skel-root/armbox/hd51/etc/init.d/networking

@@ -1,21 +0,0 @@
-#!/bin/sh
-
-. /etc/init.d/globals
-
-case "$1" in
-	start)
-		SHOWINFO "Configuring network ... "
-		ifup -a -f
-	;;
-	stop)
-		SHOWINFO "Deconfiguring network ... "
-		ifdown -a
-	;;
-	force-reload|restart)
-		$0 stop
-		$0 start
-	;;
-	*)
-		echo "[$BASENAME] Usage: $0 {start|restart|force-reload|stop}"
-	;;
-esac

skel-root/coolstream/hd1/etc/init.d/networking

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-. /etc/init.d/globals
-
-case "$1" in
-	start)
-		SHOWINFO "Configuring network ..."
-		ifup -a -f
-		if type ifplugd >/dev/null 2>&1; then
-			SHOWINFO "Starting ifplugd ..."
-			ifplugd -F -p -q
-		fi
-	;;
-	stop)
-		SHOWINFO "Deconfiguring network ..."
-		ifdown -a
-		if type ifplugd >/dev/null 2>&1; then
-			SHOWINFO "Killing ifplugd ..."
-			ifplugd -k
-		fi
-	;;
-	force-reload|restart)
-		$0 stop
-		$0 start
-	;;
-	*)
-		echo "[$BASENAME] Usage: $0 {start|restart|force-reload|stop}"
-	;;
-esac

skel-root/coolstream/hd2/etc/init.d/networking

@@ -1,21 +0,0 @@
-#!/bin/sh
-
-. /etc/init.d/globals
-
-case "$1" in
-	start)
-		SHOWINFO "Configuring network ... "
-		ifup -a -f
-	;;
-	stop)
-		SHOWINFO "Deconfiguring network ... "
-		ifdown -a
-	;;
-	force-reload|restart)
-		$0 stop
-		$0 start
-	;;
-	*)
-		echo "[$BASENAME] Usage: $0 {start|restart|force-reload|stop}"
-	;;
-esac

skel-root/coolstream/hd1/etc/ifplugd/ifplugd.action → skel-root/general/scripts/ifplugd.action

@@ -6,7 +6,7 @@
 . /etc/init.d/globals
 
 case $2 in
-	up)	ifup	$1 | LOGINFO ;;
+	up)	ifup   $1 | LOGINFO ;;
-	down)	ifdown	$1 | LOGINFO ;;
+	down)	ifdown $1 | LOGINFO ;;
 esac
 true