Changeset 2591 in MondoRescue for branches/2.2.10/mindi/rootfs/sbin/start-netfs

Timestamp:

Mar 11, 2010, 2:56:00 AM (15 years ago)

Author:

Bruno Cornec

Message:

r3723@localhost: bruno | 2010-03-09 23:56:51 +0100

• No error msg if mondorestore.cfg doesn't exist (mindi alone)

File:

• branches/2.2.10/mindi/rootfs/sbin/start-netfs (modified) (4 diffs)

branches/2.2.10/mindi/rootfs/sbin/start-netfs

@@ -10 +10 @@
 ipcount=3
 
-# Get info from config file
-ipdev=`grep netfs-dev $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
-ipaddress=`grep netfs-client-ipaddr $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
-ipnetmask=`grep netfs-client-netmask $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
-ipbroadcast=`grep netfs-client-broadcast $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
-ipgateway=`grep netfs-client-defgw $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
-proto=`grep netfs-proto $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
 ipconf=""
 pre=""
 post=""
-export netfsmount=`grep netfs-server-mount $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
-export imgname=`grep iso-prefix $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+ipdev=""
+ipaddress=""
+ipnetmask=""
+ipbroadcast=""
+ipgateway=""
+proto=""
+netfsmount=""
+imgname=""
+dirimg=""
+
+# Get info from config file
+if [ -f $MINDI_CACHE/mondorestore.cfg ]; then
+    ipdev=`grep netfs-dev $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+    ipaddress=`grep netfs-client-ipaddr $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+    ipnetmask=`grep netfs-client-netmask $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+    ipbroadcast=`grep netfs-client-broadcast $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+    ipgateway=`grep netfs-client-defgw $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+    proto=`grep netfs-proto $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+    export netfsmount=`grep netfs-server-mount $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+    export imgname=`grep iso-prefix $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+    export dirimg=`grep netfs-server-path $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
+fi
+
 if [ "$imgname" = "" ]; then
     export imgname="mondorescue"
 fi
-export dirimg=`grep netfs-server-path $MINDI_CACHE/mondorestore.cfg 2> /dev/null | cut -d' ' -f2-`
 if [ "$dirimg" = "" ]; then
     export dirimg="/"
@@ -54 +67 @@
     if [ $? -eq 0 ]; then
         ipdev=`echo $ipconf | cut -d: -f1`
-        LogIt "Making DHCP request on $ipdev"
-        udhcpc -i $ipdev
+        dhc="/sbin/dhclient"
+        if [ ! -x $dhc ]; then
+            dhc="/sbin/dhcpcd"
+            if [ ! -x $dhc ]; then
+                dhc="/sbin/udhcpc"
+                if [ ! -x $dhc ]; then
+                    dhc=""
+                else
+                    dhc="$dhc -i"
+                fi
+            fi
+        fi
+        if [ -x $dhc ]; then
+            LogIt "Making DHCP request on $ipdev with $dhc"
+            $dhc $ipdev
+        else
+            LogIt "Unable to make a DHCP request on $ipdev - no client found"
+        fi
     else
         if [ "$ipconf" != "" ]; then
@@ -70 +99 @@
 
     # ping server helps waking interface up
-    LogIt "Pinging Remote server..."
     netfs_server_ipaddr=`echo $netfsmount | cut -d: -f1 | cut -d@ -f2`
-    ping -c $ipcount $netfs_server_ipaddr 
+    if [ $netfs_server_ipaddr != "" ]; then
+        LogIt "Pinging Remote server $netfs_server_ipaddr ($ipcount times)..."
+        ping -c $ipcount $netfs_server_ipaddr 
+    fi
 
     # Which is our protocol for file sharing
@@ -80 +111 @@
     fi
 
-    if [ "$proto" = "sshfs" ]; then
-        LogIt "Mounting SSHFS share ($netfsmount) on /tmp/isodir..."
-        # We need a correct console for ssh
-        ln -sf /dev/console /dev/tty
-        sshfs -o ro,StrictHostKeyChecking=no $netfsopt $netfsmount /tmp/isodir
-    elif [ "$proto" != "" ]; then
-        LogIt "Mounting Network share ($netfsmount) on /tmp/isodir..."
-        touch /etc/mtab
-        mount -t $proto -o nolock,ro $netfsopt $netfsmount /tmp/isodir
+    if [ "$netfsmount" != "" ]; then
+        if [ "$proto" = "sshfs" ]; then
+            LogIt "Mounting SSHFS share ($netfsmount) on /tmp/isodir..."
+            # We need a correct console for ssh
+            ln -sf /dev/console /dev/tty
+            sshfs -o ro,StrictHostKeyChecking=no $netfsopt $netfsmount /tmp/isodir
+        elif [ "$proto" != "" ]; then
+            LogIt "Mounting Network share ($netfsmount) on /tmp/isodir..."
+            touch /etc/mtab
+            mount -t $proto -o nolock,ro $netfsopt $netfsmount /tmp/isodir
+        else
+            LogIt "Unknown protocol $proto"
+        fi
+
+        # In all these cases we should have an image
+        LogIt "Mounting Remote image ${imgname}-1.iso in $dirimg on /mnt/cdrom in loopback"
+        mount -o ro,loop -t iso9660 /tmp/isodir/$dirimg/${imgname}-1.iso /mnt/cdrom
     else
-        LogIt "Unknown protocol $proto"
+        LogIt "No image to mount"
     fi
     
-    LogIt "Mounting Remote image ${imgname}-1.iso in $dirimg on /mnt/cdrom in loopback"
-    mount -o ro,loop -t iso9660 /tmp/isodir/$dirimg/${imgname}-1.iso /mnt/cdrom
-
     # Save the scripts on the Network share locally
     if [ "`echo $pre | grep -E '^/tmp/isodir'`" ]; then