[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3d8f85ec45d6a4b405415081cfe840f5ed599e50

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 2689 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  3d8f85ec45d6a4b405415081cfe840f5ed599e50 (commit)
      from  180557381b64d0d84d207a3963e2b0aee9921f80 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3d8f85ec45d6a4b405415081cfe840f5ed599e50
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Sep 17 20:46:39 2012 +0200

    vlans: Make script that creates the interfaces silent.

-----------------------------------------------------------------------

Summary of changes:
 src/initscripts/init.d/network-vlans |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/src/initscripts/init.d/network-vlans b/src/initscripts/init.d/network-vlans
index 88733e6..2fdfe9e 100755
--- a/src/initscripts/init.d/network-vlans
+++ b/src/initscripts/init.d/network-vlans
@@ -26,7 +26,7 @@ CONFIG_FILE="/var/ipfire/ethernet/vlans"
 # Skip immediately if no configuration file has been found.
 [ -e "${CONFIG_FILE}" ] || exit 0
 
-eval $(readhash ${CONFIG_FILE})
+eval $(/usr/local/bin/readhash ${CONFIG_FILE})
 
 # This is start or stop.
 action=${1}
@@ -52,21 +52,26 @@ for interface in green0 blue0 orange0; do
 
 	case "${action}" in
 		start)
+			# If no parent device has been configured, we assume
+			# that this interface is not set up for VLANs and
+			# silently go on.
+			[ -z "${PARENT_DEV}" ] && continue
+
 			# Check if the interface does already exists.
 			# If so, we skip creating it.
 			if [ -d "/sys/class/net/${interface}" ]; then
-				echo "Interface ${interface} already exists."
+				echo "Interface ${interface} already exists." >&2
 				continue
 			fi
 
 			# Check if the parent interface exists.
-			if [ -z "${PARENT_DEV}" ] || [ ! -d "/sys/class/net/${PARENT_DEV}" ]; then
-				echo "${interface}: Parent device is not set or does not exist: ${PARENT_DEV}"
+			if [ ! -d "/sys/class/net/${PARENT_DEV}" ]; then
+				echo "${interface}: Parent device is not set or does not exist: ${PARENT_DEV}" >&2
 				continue
 			fi
 
 			if [ -z "${VLAN_ID}" ]; then
-				echo "${interface}: You did not set the VLAN ID."
+				echo "${interface}: You did not set the VLAN ID." >&2
 				continue
 			fi
 


hooks/post-receive
--
IPFire 2.x development tree