Changeset 1696 in MondoRescue

Timestamp:

Oct 21, 2007, 1:07:54 PM (17 years ago)

Author:

Bruno Cornec

Message:

Stil refining USB copy back to mondo (one command was not executed)

Location:

branches/2.2.5

Files:

• mindi/mindi (modified) (4 diffs)
• mondo/src/common/libmondo-archive.c (modified) (2 diffs)
• pbconf/mondorescue.pb (modified) (1 diff)

branches/2.2.5/mindi/mindi

@@ -1767 +1767 @@
             cp -f $j $k 2> /dev/null || Die "Failed to copy $j to $k"
             cp -f $j $MINDI_TMP 2> /dev/null || Die "Failed to copy $j to $MINDI_TMP"
-            if [ _"$MONDO_SHARE" != _"" ]; then
-                cp -f $j $MONDO_ROOT 2>> $LOGFILE || Die "Failed to copy $j to $MONDO_ROOT"
-            fi
         fi
     done
@@ -1788 +1785 @@
     echo -en "."
     if [ "$ARCH" != "ia64" ] ; then
-        if [ _"$MONDO_SHARE" != _"" ]; then
-            cp -f $MONDO_SHARE/autorun $MONDO_ROOT 2>> $LOGFILE
-        fi
         umount $MINDI_TMP/usb
         syslinux $USBPART 2>> $MINDI_TMP/syslinux.log
@@ -3137 +3131 @@
         export MINDI_TMP=$MONDO_TMP
         mkdir -p $MINDI_TMP
-        # This is the scratch dir in mondo
+        # This is the scratch dir in mondo - subdir images
         CACHE_LOC=$3
         if [ _"$CACHE_LOC" != _"" ]; then
@@ -3201 +3195 @@
         fi
         [ "$CDRECOVERY" = "yes" ] && [ "$TAPEDEV" != "" ] && Die "Sorry, you can't use --cd-recovery and --write-tapes at the same time"
+        # MONDO_ROOT is the real scratchdir
         MONDO_ROOT=`echo $CACHE_LOC | sed 's/\(.*\)\/.*/\1/'`
         if [ _"$MONDO_ROOT" != _"" ]; then

branches/2.2.5/mondo/src/common/libmondo-archive.c

@@ -1083 +1083 @@
                     bkpinfo->tmpdir, bkpinfo->scratchdir);
             if (system(command)) {
-                fatal_error("Unable to create temporary duff tarball");
+                fatal_error("Unable to create temporary all tarball");
             }
         }
@@ -1089 +1089 @@
         if (bkpinfo->backup_media_type == usb) {
             sprintf(command, "rm -rf %s/images", bkpinfo->scratchdir);
-            system(tmp);
+            run_program_and_log_output(command, FALSE);
         } else {
             sprintf(command, "cp -f %s/mindi-*oot*.img %s/images",
                 bkpinfo->tmpdir, bkpinfo->scratchdir);
+            if (system(command)) {
+                log_msg(2, "Unable to copy mindi images");
+            }
             sprintf(tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir,
                 bkpinfo->tmpdir);

branches/2.2.5/pbconf/mondorescue.pb

@@ -28 +28 @@
 # Files are mentioned relatively to pbroot
 filteredfiles mondo = configure.in
-filteredfiles mondo-doc = mondorescue-howto.sgml,mondoarchive.8,mondorestore.8
+filteredfiles mondo-doc = mondorescue-howto.sgml,mondoarchive.8,mondorestore.8,mindi.8
 filteredfiles mindi = rootfs/sbin/init,mindi,install.sh
 filteredfiles mondo-website = top.shtml