Changeset 2598 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.c

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

File:

• branches/2.2.10/mondo/src/common/libmondo-archive.c (modified) (4 diffs)

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);