Changeset 2382 in MondoRescue for branches/2.2.10/mindi/rootfs/sbin

Timestamp:

Sep 10, 2009, 2:07:16 AM (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)

(Backport from 2.2.9)

Location:

branches/2.2.10/mindi/rootfs/sbin

Files:

• init (modified) (5 diffs)
• start-netfs (copied) (copied from branches/2.2.9/mindi/rootfs/sbin/start-netfs ) (1 diff)
• start-nfs (deleted)

branches/2.2.10/mindi/rootfs/sbin/init

@@ -724 +724 @@
 fi
 if [ "`grep -i pxe $CMDLINE`" ] || [ "`grep -i net $CMDLINE`" ]; then
-    # We need to get here exported variables from start-nfs
-    . /sbin/start-nfs
+    # We need to get here exported variables from start-netfs
+    . /sbin/start-netfs
 fi
 
@@ -737 +737 @@
     ExtractDataDisksAndLoadModules
     # Fake the conf file to force it to NFS mode, even if we made originally a CD (mandatory for mondorestore to work correctly)
-    sed -i "s/backup-media-type.*/backup-media-type nfs/" /tmp/mondo-restore.cfg
+    sed -i "s/backup-media-type.*/backup-media-type netfs/" /tmp/mondo-restore.cfg
 elif [ "`grep -i usb= $CMDLINE`" ] || [ "`grep -i usb /tmp/mondo-restore.cfg 2>/dev/null | grep media-type`" ]; then
     . /sbin/start-usb
@@ -748 +748 @@
     HandleCDROM
     ExtractDataDisksAndLoadModules
-    # We need to get here exported variables from start-nfs
-    . /sbin/start-nfs
+    # We need to get here exported variables from start-netfs
+    . /sbin/start-netfs
 fi
 res=$?
@@ -848 +848 @@
     LogIt "backup-media-type is specified in config file - great."
     LogIt "Calling post-init"
-    # start-nfs moved it under /tmp as the NFS share is already unmounted 
+    # start-netfs moved it under /tmp as the NFS share is already unmounted 
     if [ "`echo $pre | grep -E '^/tmp/isodir'`" ]; then
         post=`echo $pre | sed 's|^/tmp/isodir|/tmp|'`
@@ -866 +866 @@
         echo $i | grep -qi post= && post=`echo $i | cut -d= -f2`
     done
-    # start-nfs moved it under /tmp as the NFS share is already unmounted 
+    # start-netfs moved it under /tmp as the NFS share is already unmounted 
     if [ "`echo $post | grep -E '^/tmp/isodir'`" ]; then
         post=`echo $post | sed 's|^/tmp/isodir|/tmp|'`

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

@@ -31 +31 @@
 
 # info from cmdline are predominent
-for i in `cat /proc/cmdline` ; do
+for i in `cat $CMDLINE` ; do
     echo $i | grep -qi ping= && ipcount=`echo $i | cut -d= -f2`
     echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`