Changeset 3542 in MondoRescue for branches/3.2/mindi

Timestamp:

Mar 24, 2016, 5:48:03 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Rename all mondorestore scripts with the mr- prefix and adapt callers
• Place these scripts in /usr/bin on the restore media
• Fix a mindi bug where these scripts were not copied anymore with previous modifications around removal of cd

Location:

branches/3.2/mindi

Files:

• mindi (modified) (2 diffs)
• rootfs/etc/init.d/rcS (modified) (1 diff)
• rootfs/usr/sbin/post-init (modified) (1 diff)

branches/3.2/mindi/mindi

@@ -2142 +2142 @@
     fi
     if [ -e "$MONDO_SHARE/restore-scripts" ]; then
-        cp -Rdf $MONDO_SHARE/restore-scripts/* . 2>> $LOGFILE
+        cp -Rdf $MONDO_SHARE/restore-scripts/* $bigdir/usr/bin 2>> $LOGFILE
         [ $? -ne 0 ] && [ _"$MONDO_SHARE" != _"" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"
     fi
     if [ -d "/lib/dev-state" ]; then 
-        cp -a /lib/dev-state ./lib/ 2>> $MINDI_TMP/$$.log || LogAll "ERROR: Unable to handle /lib/dev-state" $MINDI_TMP/$$.log
+        cp -a /lib/dev-state $bigdir/lib/ 2>> $MINDI_TMP/$$.log || LogAll "ERROR: Unable to handle /lib/dev-state" $MINDI_TMP/$$.log
     fi
     TOTAL_BIGDIR_SIZE=`du -sk $bigdir | cut -f1`
@@ -2263 +2263 @@
                 LogFile "INFO: Copying $LDLINUXE64 to $efidir"
                 cp $LDLINUXE64 $efidir 2>> $LOGFILE || Die "Cannot copy $LDLINUXE64 to $efidir). Did you run out of disk space?"
+                cp $LDLINUXE64/../libutil.c32 $efidir 2>> $LOGFILE || Die "Cannot copy $LDLINUXE64 to $efidir). Did you run out of disk space?"
             fi
         fi

branches/3.2/mindi/rootfs/etc/init.d/rcS

@@ -1129 +1129 @@
         LogIt "Executing final script $post"
         if [ "`echo $post | grep -E '^/mnt/RESTORING'`" ]; then
-            mount-me
+            mr-mount-me
         fi
         chmod 755 $post
         $post
         if [ "`echo $post | grep -E '^/mnt/RESTORING'`" ]; then
-            unmount-me
+            mr-unmount-me
         fi
     fi

branches/3.2/mindi/rootfs/usr/sbin/post-init

@@ -50 +50 @@
 fi
 
-for i in mount-me unmount-me mondorestore ; do
+for i in mr-mount-me mr-unmount-me mondorestore ; do
     if which $i > /dev/null 2> /dev/null ; then
         LogIt "$i found"