Changeset 3271 in MondoRescue for branches/3.2/mindi/rootfs/usr/sbin/start-netfs

Timestamp:

Apr 29, 2014, 9:23:09 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Rename the conf file mondo-restore.cfg into mondorestore.cfg for homogeneity (continued)

File:

• branches/3.2/mindi/rootfs/usr/sbin/start-netfs (modified) (3 diffs)

branches/3.2/mindi/rootfs/usr/sbin/start-netfs

@@ -11 +11 @@
 
 # Get info from config file
-ipdev=`grep netfs-dev /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
-hwaddr=`grep netfs-client-hwaddr /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
-ipaddress=`grep netfs-client-ipaddr /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
-ipnetmask=`grep netfs-client-netmask /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
-ipbroadcast=`grep netfs-client-broadcast /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
-ipgateway=`grep netfs-client-defgw /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
-proto=`grep netfs-proto /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
-iproute=`grep netfs-route /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
+ipdev=`grep netfs-dev /tmp/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+hwaddr=`grep netfs-client-hwaddr /tmp/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+ipaddress=`grep netfs-client-ipaddr /tmp/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+ipnetmask=`grep netfs-client-netmask /tmp/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+ipbroadcast=`grep netfs-client-broadcast /tmp/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+ipgateway=`grep netfs-client-defgw /tmp/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+proto=`grep netfs-proto /tmp/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+iproute=`grep netfs-route /tmp/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
 ipconf=""
 pre=""
 post=""
-export netfsmount=`grep netfs-server-mount /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
-export imgname=`grep iso-prefix /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
+export netfsmount=`grep netfs-server-mount /tmp/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+export imgname=`grep iso-prefix /tmp/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
 if [ "$imgname" = "" ]; then
     export imgname="mondorescue"
 fi
-export dirimg=`grep netfs-server-path /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
+export dirimg=`grep netfs-server-path /tmp/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
 if [ "$dirimg" = "" ]; then
     export dirimg="/"
@@ -70 +70 @@
 
         # If same system, map to the right MAC address
-        hwaddr_found=`ifconfig $ipdev | /bin/grep HWaddr | awk '{print $NF}'`
-        if [ "$hwaddr" != "$hwaddr_found" ]; then
-            ipdev_new=`ifconfig -a | /bin/grep $hwaddr | awk '{print $1}'`
-            if [ "$ipdev_new" != "" ]; then
-                LogIt "Interface $ipdev changed to $ipdev_new (MAC: $hwaddr)"
-                ipdev=$ipdev_new
-            else
-                LogIt "NOTE: Interface $ipdev kept despite it doesn't match the $hwaddr MAC address"
+        if [ "$hwaddr" != "" ]; then
+            hwaddr_found=`ifconfig $ipdev | grep HWaddr | awk '{print $NF}'`
+            if [ "$hwaddr" != "$hwaddr_found" ]; then
+                ipdev_new=`ifconfig -a | grep $hwaddr | awk '{print $1}'`
+                if [ "$ipdev_new" != "" ]; then
+                    LogIt "Interface $ipdev changed to $ipdev_new (MAC: $hwaddr)"
+                    ipdev=$ipdev_new
+                else
+                    LogIt "NOTE: Interface $ipdev kept despite it doesn't match the $hwaddr MAC address"
+                fi
             fi
         fi
@@ -118 +120 @@
     elif [ "$proto" != "" ]; then
         if [ -x /sbin/rpcbind ]; then
-            "Starting rpcbind daemon..."
+            echo "Starting rpcbind daemon..."
             /sbin/rpcbind -w &
         fi