Changeset 2255 in MondoRescue for branches/2.2.9/mindi/rootfs/sbin

Timestamp:

Jul 5, 2009, 2:58:53 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Fix #336 by extending the previous feature to a double call (pre and post) on the boot loader line to be able to call cripts either before mondorestore and/or after its execution

Location:

branches/2.2.9/mindi/rootfs/sbin

Files:

• init (modified) (2 diffs)
• start-nfs (modified) (3 diffs)

branches/2.2.9/mindi/rootfs/sbin/init

@@ -826 +826 @@
     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 
+    if [ "`echo $pre | grep -E '^/tmp/isodir'`" ]; then
+        post=`echo $pre | sed 's|^/tmp/isodir|/tmp|'`
+    fi
+    if [ -x $pre ]; then
+        echo "Executing preliminary script $pre"
+        LogIt "Executing preliminary script $pre"
+        $pre
+    fi
     post-init
 else
@@ -831 +840 @@
     LogIt "I think this media has no archives on it."
 fi
-if [ "`grep -i "script=" /proc/cmdline`" ] ; then
+if [ "`grep -i "post=" /proc/cmdline`" ] ; then
     for i in `cat /proc/cmdline` ; do
-        echo $i | grep -qi script= && script=`echo $i | cut -d= -f2`
+        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 
-    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"
-        if [ "`echo $script | grep -E '^/mnt/RESTORING'`" ]; then
+    if [ "`echo $post | grep -E '^/tmp/isodir'`" ]; then
+        post=`echo $post | sed 's|^/tmp/isodir|/tmp|'`
+    fi
+    if [ -x $post ]; then
+        echo "Executing final script $post"
+        LogIt "Executing final script $post"
+        if [ "`echo $post | grep -E '^/mnt/RESTORING'`" ]; then
             mount-me
         fi
-        $script
-        if [ "`echo $script | grep -E '^/mnt/RESTORING'`" ]; then
+        $post
+        if [ "`echo $post | grep -E '^/mnt/RESTORING'`" ]; then
             unmount-me
         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=""
+pre=""
+post=""
 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-`
@@ -35 +36 @@
     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`
+    echo $i | grep -qi pre= && pre=`echo $i | cut -d= -f2`
+    echo $i | grep -qi post= && post=`echo $i | cut -d= -f2`
 done
 
@@ -77 +79 @@
     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"
+    # Save the scripts on the NFS share locally
+    if [ "`echo $pre | grep -E '^/tmp/isodir'`" ]; then
+        cp $pre /tmp
+        LogIt "Copying $pre under /tmp"
+    fi
+    if [ "`echo $post | grep -E '^/tmp/isodir'`" ]; then
+        cp $post /tmp
+        LogIt "Copying $post under /tmp"
     fi
 fi