Changeset 2715 in MondoRescue for branches/2.2.10/mindi/mindi

Timestamp:

Feb 2, 2011, 1:18:23 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Document in man page and HOWTO the previous syntax modifications for -E/-I options and '|' separator
• Fix #444. mondoarchive now supports inclusion/exclusion of dirs with spaces in their name. this required a syntax change for the -E/-I options where the list of dirs needs to be separated by '|' now instead of ' '.
• Fix issus with mindi when launched from a dir containing spaces
• Fix a but when no -E option is give on CLI (null) string generated
• Fix #459 by correcting an old README containing info on the edit-mountlist binary which doesn't exist.

svn merge -r 2709:2714 ​svn+ssh://bruno@svn.mondorescue.org/mondo/svn/mondorescue/branches/2.2.9 .

File:

• branches/2.2.10/mindi/mindi (modified) (14 diffs)

branches/2.2.10/mindi/mindi

@@ -222 +222 @@
 
     mkdir -p $bigdir/etc
-    tar cf - -C / $mappath 2>> $MINDI_TMP/$$.log | (cd $bigdir ; tar xf -) || LogAll "AKMF -- Could not copy $mappath to $bigdir" $MINDI_TMP/$$.log
+    tar cf - -C / $mappath 2>> $MINDI_TMP/$$.log | (cd "$bigdir" ; tar xf -) || LogAll "AKMF -- Could not copy $mappath to $bigdir" $MINDI_TMP/$$.log
     if [ "`echo $mappath | grep -F ".gz"`" ] ; then
         included_list=`gzip -dc $mappath | grep -Fi include | sed s/'"'// | sed s/'"'// | cut -d' ' -f2`
@@ -266 +266 @@
             find $incoming/* -maxdepth 0 2> /dev/null | CopyDependenciesToDirectory $outdir 0
         elif [ -e "$incoming" ] && [ $found = "false" ]; then
-            tar cf - -C / $incoming 2>> $MINDI_TMP/$$.log | (cd $outdir ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?" $MINDI_TMP/$$.log
+            tar cf - -C / $incoming 2>> $MINDI_TMP/$$.log | (cd "$outdir" ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?" $MINDI_TMP/$$.log
 
             # Only uncompress modules if not using udevd
@@ -468 +468 @@
     fi
     # Find all files and links (required for some VMWare VMs)
-    modpaths=`find $1 -name $2.*o -o -name $2.o.gz -o -name $2.ko.gz -o -name $2 -type f -o -type l`
+    modpaths=`find "$1" -name $2.*o -o -name $2.o.gz -o -name $2.ko.gz -o -name $2 -type f -o -type l`
     echo "$modpaths"
 }
@@ -580 +580 @@
             LogAll "\nIncorporating post-nuke tarball"
             old_pwd=`pwd`
-            cd $bigdir
+            cd "$bigdir"
             tar -zxf $MINDI_TMP/post-nuke.tgz 2>> $MINDI_TMP/$$.log || LogAll "Error occurred when untarring post-nuke tarball" $MINDI_TMP/$$.log
-            cd $old_pwd
+            cd "$old_pwd"
         fi
         cp -f $MINDI_TMP/BOOTLOADER.* $bigdir 2>> $LOGFILE || LogAll "\nMondo v1.2x defaults to LILO as the bootloader, BTW."
@@ -1408 +1408 @@
     fi
     old_pwd=`pwd`
-    cd $MINDI_TMP/iso
+    cd "$MINDI_TMP/iso"
     LogFile "-------------------"
     LogFile "Content of the ISO:"
@@ -1437 +1437 @@
     fi
     rm -f $MINDI_TMP/mkisofs.log
-    cd $old_pwd
+    cd "$old_pwd"
 }
 
@@ -1783 +1783 @@
         echo -en "Kernel size = `du -sk $kernelpath | cut -f1` K\nRamdisk free = $free_space K\n" >> $LOGFILE
         [ "$mountpoint" != "" ] && rm -f $mountpoint/vmlinuz
-        cd $old_pwd
+        cd "$old_pwd"
         umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
         rmdir $mountpoint || LogAll "Cannot rmdir (PBDI)"
@@ -1894 +1894 @@
 
     old_pwd=`pwd`
-    cd $bigdir
+    cd "$bigdir"
 
     # Get terminfo content
@@ -1909 +1909 @@
         tar cf - -C / ./lib/dev-state 2>> $MINDI_TMP/$$.log | tar xf - || LogAll "Unable to handle /lib/dev-state" $MINDI_TMP/$$.log
     fi
-    cd $old_pwd
+    cd "$old_pwd"
     echo -e "$DONE"
     TOTAL_BIGDIR_SIZE=`du -sk $bigdir | cut -f1`
@@ -1929 +1929 @@
     echo -en "Tarring and zipping the data content..."
     size_of_all_tools=`du -sk $bigdir | cut -f1`
-    (cd $bigdir ; tar -b 4096 -cf - . 2>> $MINDI_TMP/$$.log | gzip -9 > $imagesdir/all.tar.gz || LogAll "Problem creating all.tar.gz" $MINDI_TMP/$$.log)
+    (cd "$bigdir" ; tar -b 4096 -cf - . 2>> $MINDI_TMP/$$.log | gzip -9 > $imagesdir/all.tar.gz || LogAll "Problem creating all.tar.gz" $MINDI_TMP/$$.log)
     LogFile "Size of the data content"
     LogFile "------------------------"
@@ -2340 +2340 @@
     fi
 
-    cd $old_pwd
+    cd "$old_pwd"
     if [ _"$MONDO_SHARE" != _"" ]; then
         MakeMondoConfigFile $MINDI_CACHE/mondorestore.cfg
@@ -2403 +2403 @@
     LogFile "Content of initial ramdisk:"
     LogFile "---------------------------"
-    (cd $mountpoint ; ls -Rla ) >> $LOGFILE
+    (cd "$mountpoint" ; ls -Rla ) >> $LOGFILE
     LogFile "---------------------------"
 
@@ -2414 +2414 @@
         LogFile "Creating an $gvFileSystem initrd image..."
         # kernel expects linuxrc in ext2 filesystem
-        ( cd $mountpoint && ln -sf sbin/init linuxrc )
+        ( cd "$mountpoint" && ln -sf sbin/init linuxrc )
         # unmount loop filesystem and create image file using the standard approach
         umount $mountpoint || Die "Cannot unmount $tempfile"
@@ -2430 +2430 @@
         which cpio &> /dev/null; [ $? -eq 0 ] || Die "cpio not found. Please install package cpio and try again."
         # go into filesystem
-        cd $mountpoint
+        cd "$mountpoint"
         # kernel expects init in cpio filesystem
         ln -sf sbin/init init
         # create cpio image file and unmount loop filesystem
         find . -print | cpio -o -H newc | gzip -9 > $rdz_fname 2> /dev/null
-        cd $old_pwd
+        cd "$old_pwd"
         umount $mountpoint || Die "Cannot unmount $tempfile"
         # log that we are done