[patch] files/scripts.diff

scripts.diff (text/plain), 4.09 KB, created by Sebastian T. Hafner on 2008-04-03 14:22:43 UTC

diff -urN open-vm-tools-2008.03.19-82724/scripts/linux/resume-vm-default [e-mail]/scripts/linux/resume-vm-default
--- open-vm-tools-2008.03.19-82724/scripts/linux/resume-vm-default	2008-03-19 08:49:53.000000000 +0100
+++ [e-mail]/scripts/linux/resume-vm-default	2008-04-03 15:19:23.000000000 +0200
@@ -23,66 +23,6 @@
 ##########################################################################
 
 echo `date` ": Executing '$0'"
-echo
-
-find_networking_script() {
-    local script="error"
-    for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do
-        if [ -d "$dir/rc0.d" ] &&
-	    [ -d "$dir/rc1.d" ] &&
-	    [ -d "$dir/rc2.d" ] &&
-	    [ -d "$dir/rc3.d" ] &&
-	    [ -d "$dir/rc4.d" ] &&
-	    [ -d "$dir/rc5.d" ] &&
-	    [ -d "$dir/rc6.d" ]; then
-
-	    # Now find the appropriate networking script.
-	    if [ -d "$dir/init.d" ]; then
-		if [ -x "$dir/init.d/network" ]; then
-		    script="$dir/init.d/network"
-		elif [ -x "$dir/init.d/networking" ]; then
-		    script="$dir/init.d/networking"
-		fi
-	    else
-		if [ -x "$dir/network" ]; then
-		    script="$dir/network"
-		elif [ -x "$dir/networking" ]; then
-		    script="$dir/networking"
-		fi
-	    fi
-        fi
-    done
-
-    echo "$script"
-}
-
-rescue_NIC() {
-   niclist="/var/run/vmware-active-nics"
-
-   ifup_path=`which ifup 2>/dev/null`;
-   if [ $? -ne 0 ]; then
-      return 1;
-   fi
-
-   ifconfig_path=`which ifconfig 2>/dev/null`;
-   if [ $? -ne 0 ]; then
-      return 1;
-   fi
-
-   if [ -f "$niclist" ]; then
-      while read nic; do
-         if $ifconfig_path $nic | egrep '^ +UP ' >/dev/null 2>&1; then
-            echo `date` "[resume-vm-default::rescue_nic] $nic is already active."
-         else
-            echo `date` "[rescue_nic] activating $nic ..."
-
-            $ifup_path $nic
-         fi
-      done < $niclist
-
-      rm -f $niclist
-   fi
-}
 
 #
 # main
@@ -95,18 +35,3 @@
     done
 fi
 
-network=`find_networking_script`
-if [ "$network" != "error" ]; then
-   "$network" restart
-   # Continue even if the networking init script wasn't successful.
-   status=0
-else
-   echo "networking script not found"
-   status=1
-fi
-
-if [ $status -eq 0 ]; then
-    rescue_NIC
-fi
-
-exit "$status"
diff -urN open-vm-tools-2008.03.19-82724/scripts/linux/suspend-vm-default [e-mail]/scripts/linux/suspend-vm-default
--- open-vm-tools-2008.03.19-82724/scripts/linux/suspend-vm-default	2008-03-19 08:49:53.000000000 +0100
+++ [e-mail]/scripts/linux/suspend-vm-default	2008-04-03 15:20:02.000000000 +0200
@@ -23,45 +23,6 @@
 ##########################################################################
 
 echo `date` ": Executing '$0'"
-echo
-
-find_networking_script() {
-    local script="error"
-    for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do
-        if [ -d "$dir/rc0.d" ] &&
-	    [ -d "$dir/rc1.d" ] &&
-	    [ -d "$dir/rc2.d" ] &&
-	    [ -d "$dir/rc3.d" ] &&
-	    [ -d "$dir/rc4.d" ] &&
-	    [ -d "$dir/rc5.d" ] &&
-	    [ -d "$dir/rc6.d" ]; then
-
-	    # Now find the appropriate networking script.
-	    if [ -d "$dir/init.d" ]; then
-		if [ -x "$dir/init.d/network" ]; then
-		    script="$dir/init.d/network"
-		elif [ -x "$dir/init.d/networking" ]; then
-		    script="$dir/init.d/networking"
-		fi
-	    else
-		if [ -x "$dir/network" ]; then
-		    script="$dir/network"
-		elif [ -x "$dir/networking" ]; then
-		    script="$dir/networking"
-		fi
-	    fi
-        fi
-    done
-
-    echo "$script"
-}
-
-save_active_NIC_list() {
-    ifconfig_path=`which ifconfig 2>/dev/null`
-    if [ $? ]; then
-       "$ifconfig_path" | grep '^[^[:space:]]' | awk '{ print $1 }' > /var/run/vmware-active-nics
-    fi
-}
 
 #
 # main
@@ -73,18 +34,3 @@
       [ -x "$scriptfile" ] && "$scriptfile" suspend-vm
    done
 fi
-
-save_active_NIC_list
-
-network=`find_networking_script`
-if [ "$network" != "error" ]; then
-   "$network" stop
-   # If the network is down, this may fail but that's not a good reason
-   # to prevent the suspend.
-   status=0
-else
-   echo "networking script not found"
-   status=1
-fi
-
-exit "$status"