Changeset 2598 in MondoRescue

Timestamp:

Mar 17, 2010, 3:55:40 AM (14 years ago)

Author:

Bruno Cornec

Message:

r3742@localhost: bruno | 2010-03-15 01:52:11 +0100

• Fix mindi/mondoarchive interface for common files

Location:

branches/2.2.10

Files:

• mindi/mindi (modified) (6 diffs)
• mondo/src/common/libmondo-archive.c (modified) (4 diffs)

branches/2.2.10/mindi/mindi

@@ -1361 +1361 @@
             cp -f $j $MINDI_TMP 2>> $LOGFILE || 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"
+                cp -f $j $MONDO_CACHE 2>> $LOGFILE || Die "Failed to copy $j to $MONDO_CACHE"
             fi
         fi
@@ -1369 +1369 @@
     cp $MINDI_TMP/initrd.img $MINDI_TMP/iso/initrd.img 2>> $LOGFILE || Die "Cannot copy initrd.img ($MINDI_TMP/initrd.img) to $MINDI_TMP/iso/initrd.img. Did you run out of disk space?"
     if [ _"$MONDO_SHARE" != _"" ]; then 
-        cp $kernelpath $MONDO_ROOT/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
-        cp $MINDI_TMP/initrd.img $MONDO_ROOT/initrd.img 2>> $LOGFILE || Die "Cannot copy initrd.img ($MINDI_TMP/initrd.img) to $MONDO_ROOT/initrd.img. Did you run out of disk space?"
+        cp $kernelpath $MONDO_CACHE/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_CACHE/vmlinuz). Did you run out of disk space?"
+        cp $MINDI_TMP/initrd.img $MONDO_CACHE/initrd.img 2>> $LOGFILE || Die "Cannot copy initrd.img ($MINDI_TMP/initrd.img) to $MONDO_CACHE/initrd.img. Did you run out of disk space?"
     fi
     MakeBootConfFile isolinux > $MINDI_TMP/iso/isolinux.cfg
@@ -1380 +1380 @@
     if [ "$ARCH" != "ia64" ] ; then
         if [ _"$MONDO_SHARE" != _"" ]; then 
-            cp -f $MINDI_TMP/iso/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy core files to ramdisk for boot disk (under $MONDO_ROOT). Did you run out of disk space?"
+            cp -f $MINDI_TMP/iso/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_CACHE 2>> $LOGFILE || Die "Cannot copy core files to ramdisk for boot disk (under $MONDO_CACHE). Did you run out of disk space?"
             cp -f $MONDO_SHARE/autorun $MINDI_TMP/iso 2>> $LOGFILE
         fi
@@ -2448 +2448 @@
 DONE="\r\t\t\t\t\t\t\t\tDone.         "
 kernelpath=""
-MONDO_ROOT=/var/cache/mondo
-mkdir -p $MONDO_ROOT
 
 if [ -d "/proc/lvm" ]; then
@@ -2619 +2617 @@
         mkdir -p $MINDI_TMP
 
-        # This is the scratch dir in mondo - subdir images
-        MINDI_CACHE=$3
+        # This is the scratch dir in mondo - subdir images 
+        # Now useless
+        #MINDI_CACHE=$3
 
         kernelpath=$4; [ "$kernelpath" = "(null)" ] && kernelpath=""
@@ -2679 +2678 @@
            LogAll "Using modules for kernel: ${kernelname}"
         fi
-        # MONDO_ROOT is the real scratchdir
-        MONDO_ROOT=`echo $MINDI_CACHE | sed 's/\(.*\)\/.*/\1/'`
-        if [ _"$MONDO_ROOT" != _"" ]; then
-            mkdir -p $MONDO_ROOT
-        else
-            Die "MONDO_ROOT is undefined"
-        fi
+
+        MONDO_CACHE=/var/cache/mondo
+        mkdir -p $MONDO_CACHE
     else
         LogScreen "Syntax: mindi (--custom ....)"

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

@@ -839 +839 @@
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
-        mr_asprintf(command, "cp -f %s/images/mindi.iso %s/mondorescue.iso", bkpinfo->scratchdir, MINDI_CACHE);
+        mr_asprintf(command, "cp -f /%s/images/mindi.iso %s/mondorescue.iso", MINDI_CACHE_REL, MINDI_CACHE);
         log_msg(2, command);
         run_program_and_log_output(command, FALSE);
@@ -858 +858 @@
             mr_free(command);
         } else {
-            mr_asprintf(tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir, bkpinfo->tmpdir);
+            mr_asprintf(tmp, "cp -f /%s/all.tar.gz %s", MINDI_CACHE_REL, bkpinfo->tmpdir);
             if (system(tmp)) {
                 mr_free(tmp);
@@ -1582 +1582 @@
     char *message_to_screen = NULL;
     char *sz_blank_disk = NULL;
-    char *tmp2 = NULL;
-    char *tmp3 = NULL;
     char *mds = NULL;
     bool cd_is_mountable;
@@ -1591 +1589 @@
     assert_string_is_neither_NULL_nor_zerolength(destfile);
 
-    mr_asprintf(tmp, "%s/isolinux.bin", bkpinfo->scratchdir);
-    mr_asprintf(tmp2, "%s/isolinux.bin", bkpinfo->tmpdir);
-    if (does_file_exist(tmp)) {
-        mr_asprintf(tmp3, "cp -f %s %s", tmp, tmp2);
-        paranoid_system(tmp3);
-        mr_free(tmp3);
-    }
-    if (!does_file_exist(tmp) && does_file_exist(tmp2)) {
-        mr_asprintf(tmp3, "cp -f %s %s", tmp2, tmp);
-        paranoid_system(tmp3);
-        mr_free(tmp3);
-    }
-    mr_free(tmp2);
+    /* Copy the files needed by isolinux in the right dir */
+    mr_asprintf(tmp, "mv "MONDO_CACHE"/{isolinux.cfg,isolinux.bin,message.txt,vmlinuz,initrd.img} %s", bkpinfo->scratchdir);
+    paranoid_system(tmp);
     mr_free(tmp);