From: Leon Woestenberg <leon@sidebranch.com>
Date: Tue, 29 Dec 2009 22:49:18 +0000 (+0100)
Subject: netbase/init: Do not run 'ifup -a' if root is network mounted.
X-Git-Tag: Release-2010-05/1~1099^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26af5ed1db81d29a59eb93cd9860d246d8dfa6a2;p=openembedded.git

netbase/init: Do not run 'ifup -a' if root is network mounted.

'ifup -a' makes a NFS mounted rootfs dissappear underneath us, so
add detection of such rootfs and do not (de)configure.

Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
---

diff --git a/recipes/netbase/netbase/init b/recipes/netbase/netbase/init
index acc26cba61..227f6ffcb9 100644
--- a/recipes/netbase/netbase/init
+++ b/recipes/netbase/netbase/init
@@ -62,17 +62,27 @@ doopt () {
 
 case "$1" in
     start)
-	# /etc/sysctl.conf is preferred
-	if [ ! -f /etc/sysctl.conf ]; then
-	  doopt spoofprotect yes
-	  doopt syncookies no
-	  doopt ip_forward no
-	fi
-
-        echo -n "Configuring network interfaces... "
-        ifup -a
-	echo "done."
-	;;
+        if sed -n 's/^[^ ]* \([^ ]*\) \([^ ]*\) .*$/\1 \2/p' /proc/mounts | 
+          grep -q "^/ nfs$"; then
+            echo "NOT configuring network interfaces: / is an NFS mount"
+        elif sed -n 's/^[^ ]* \([^ ]*\) \([^ ]*\) .*$/\1 \2/p' /proc/mounts |  
+          grep -q "^/ smbfs$"; then
+            echo "NOT configuring network interfaces: / is an SMB mount"
+	elif sed -n 's/^[^ ]* \([^ ]*\) \([^ ]*\) .*$/\2/p' /proc/mounts | 
+          grep -qE '^(nfs|smbfs|ncp|coda)$'; then
+            echo "NOT configuring network interfaces: network shares still mounted."
+        else
+            echo -n "Configuring network interfaces... "
+            ifup -a
+	    echo "done."
+ 	    # /etc/sysctl.conf is preferred
+	    if [ ! -f /etc/sysctl.conf ]; then
+	      doopt spoofprotect yes
+	      doopt syncookies no
+	      doopt ip_forward no
+	    fi
+      fi
+      ;;
     stop)
         if sed -n 's/^[^ ]* \([^ ]*\) \([^ ]*\) .*$/\1 \2/p' /proc/mounts | 
           grep -q "^/ nfs$"; then