Changeset 2253 in MondoRescue

Timestamp:

Jul 5, 2009, 2:42:33 AM (15 years ago)

Author:

Bruno Cornec

Message:

r3165@localhost: bruno | 2009-07-03 17:08:03 +0200

• Only mount /mnt/RESTORING if needed for script execution
• Copy the NFS script under /tmp as it's unmounted before we can use it

Location:

branches/2.2.9/mindi/rootfs/sbin

Files:

• init (modified) (1 diff)
• start-nfs (modified) (3 diffs)

branches/2.2.9/mindi/rootfs/sbin/init

@@ -835 +835 @@
         echo $i | grep -qi script= && script=`echo $i | cut -d= -f2`
     done
+    # start-nfs moved it under /tmp as the NFS share is already unmounted 
+    if [ "`echo $script | grep -E '^/tmp/isodir'`" ]; then
+        script=`echo $script | sed 's|^/tmp/isodir|/tmp|'`
+    fi
     if [ -x $script ]; then
         echo "Executing final script $script"
         LogIt "Executing final script $script"
-        mount-me
+        if [ "`echo $script | grep -E '^/mnt/RESTORING'`" ]; then
+            mount-me
+        fi
         $script
-        unmount-me
+        if [ "`echo $script | grep -E '^/mnt/RESTORING'`" ]; then
+            unmount-me
+        fi
     fi
 fi

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

@@ -17 +17 @@
 ipgateway=`grep nfs-client-defgw /tmp/mondo-restore.cfg 2> /dev/null | cut -d' ' -f2-`
 ipconf=""
+script=""
 export nfsmount=`grep nfs-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-`
@@ -34 +35 @@
     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 script= && script=`echo $i | cut -d= -f2`
 done
 
@@ -74 +76 @@
     LogIt "Mounting NFS 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 script on the NFS share locally
+    if [ echo "$script" | grep -E "^/tmp/isodir" ]; then
+        cp $script /tmp
+        LogIt "Copying $script under /tmp"
+    fi
 fi