Changeset 2380 in MondoRescue for branches/2.2.9/mindi/rootfs/sbin/start-netfs

Timestamp:

Sep 9, 2009, 8:30:47 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Change NFS support into a NetFS support to allow for multiple protocol in addition to NFS (NEEDS TESTING)
• Better logging to detect a potential nuke issue

File:

• branches/2.2.9/mindi/rootfs/sbin/start-netfs (moved) (moved from branches/2.2.9/mindi/rootfs/sbin/start-nfs ) (4 diffs)

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

@@ -3 +3 @@
 # $Id$
 #
-# This script sets up the network + NFS environment if needed.
+# This script sets up the network + Network FS environment if needed.
 #
 
@@ -11 +11 @@
 
 # Get info from config file
-ipdev=`grep nfs-dev /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
-ipaddress=`grep nfs-client-ipaddr /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
-ipnetmask=`grep nfs-client-netmask /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
-ipbroadcast=`grep nfs-client-broadcast /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
-ipgateway=`grep nfs-client-defgw /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
+ipdev=`grep netfs-dev /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-`
 ipconf=""
 pre=""
 post=""
-export nfsmount=`grep nfs-server-mount /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
+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-`
 if [ "$imgname" = "" ]; then
     export imgname="mondorescue"
 fi
-export dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
+export dirimg=`grep netfs-server-path /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
 if [ "$dirimg" = "" ]; then
     export dirimg="/"
@@ -33 +34 @@
     echo $i | grep -qi ping= && ipcount=`echo $i | cut -d= -f2`
     echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`
-    echo $i | grep -qi nfsmount= && export nfsmount=`echo $i | cut -d= -f2`
+    echo $i | grep -qi netfsmount= && export netfsmount=`echo $i | cut -d= -f2`
     echo $i | grep -qi prefix= && export imgname=`echo $i | cut -d= -f2`
-    echo $i | grep -qi nfspath= && export dirimg=`echo $i | cut -d= -f2`
+    echo $i | grep -qi netfspath= && export dirimg=`echo $i | cut -d= -f2`
     echo $i | grep -qi pre= && pre=`echo $i | cut -d= -f2`
     echo $i | grep -qi post= && post=`echo $i | cut -d= -f2`
+    echo $i | grep -qi proto= && proto=`echo $i | cut -d= -f2`
 done
 
@@ -67 +69 @@
 
     # ping server helps waking interface up
-    LogIt "Pinging NFS server..."
-    nfs_server_ipaddr=`echo $nfsmount | cut -d: -f1`
-    ping -c $ipcount $nfs_server_ipaddr 
+    LogIt "Pinging Remote server..."
+    netfs_server_ipaddr=`echo $netfsmount | cut -d: -f1 | cut -d@ -f2`
+    ping -c $ipcount $netfs_server_ipaddr 
 
-    # Finally mounts the NFS share
-    LogIt "Mounting NFS share ($nfsmount) on /tmp/isodir..."
-    touch /etc/mtab
-    mount -t nfs -o nolock,ro $nfsmount /tmp/isodir
+    # Which is our protocol for file sharing
+    if [ "$proto" = "" ]; then
+        LogIt "No protocol specified, defaulting to NFS"
+        $proto = "nfs"
+    fi
+
+    if [ "$proto" = "sshfs" ]; then
+        LogIt "Mounting SSHFS share ($netfsmount) on /tmp/isodir..."
+        sshfs -o ro $netfsmount /tmp/isodir
+    elif [ "$proto" != "" ]; then
+        LogIt "Mounting Network share ($netfsmount) on /tmp/isodir..."
+        touch /etc/mtab
+        mount -t $proto -o nolock,ro $netfsmount /tmp/isodir
+    else
+        LogIt "Unknown protocol $proto"
+    fi
     
-    LogIt "Mounting NFS image ${imgname}-1.iso in $dirimg on /mnt/cdrom in loopback"
+    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 NFS share locally
+    # Save the scripts on the Network share locally
     if [ "`echo $pre | grep -E '^/tmp/isodir'`" ]; then
         cp $pre /tmp