Changeset 1438 in MondoRescue for branches/stable/mondo/src/common/libmondo-archive.c

Timestamp:

May 12, 2007, 1:55:13 AM (17 years ago)

Author:

Bruno Cornec

Message:

Merge Andree's patch (2.2.4 rev [1437] around MINDI_CACHE define)
Announce for LinuxDay added

File:

• branches/stable/mondo/src/common/libmondo-archive.c (modified) (3 diffs)

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

@@ -933 +933 @@
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
-        mr_asprintf(&command, "mkdir -p /var/cache/mindi/");
+        mr_asprintf(&command, "mkdir -p "MINDI_CACHE);
         mr_msg(2, command);
         run_program_and_log_output(command, FALSE);
@@ -939 +939 @@
 
         mr_asprintf(&command,
-                "cp -f %s/images/mindi.iso /var/cache/mindi/mondorescue.iso",
-                bkpinfo->scratchdir);
+                "cp -f %s/images/mindi.iso %s/mondorescue.iso",
+                bkpinfo->scratchdir, MINDI_CACHE);
         mr_msg(2, command);
         run_program_and_log_output(command, FALSE);
@@ -2761 +2761 @@
     if (!bkpinfo->nonbootable_backup) {
 #ifdef __FreeBSD__
-        if (!does_file_exist("/var/cache/mindi/mindi-kern.1722.img"))
+        if (!does_file_exist(MINDI_CACHE"/mindi-kern.1722.img"))
 #else
         /* BERLIOS: To be improved */
-        if (!does_file_exist("/var/cache/mindi/mindi-bootroot.1722.img")
-            && !does_file_exist("/var/cache/mindi/mindi-boot.1440.img")
-            && !does_file_exist("/var/cache/mindi/mindi-boot.2880.img")
-            && !does_file_exist("/var/cache/mindi/mindi-boot.5760.img")
-            && !does_file_exist("/var/cache/mindi/mindi-boot.8192.img"))
+        if (!does_file_exist(MINDI_CACHE"/mindi-bootroot.1722.img")
+            && !does_file_exist(MINDI_CACHE"/mindi-boot.1440.img")
+            && !does_file_exist(MINDI_CACHE"/mindi-boot.2880.img")
+            && !does_file_exist(MINDI_CACHE"/mindi-boot.5760.img")
+            && !does_file_exist(MINDI_CACHE"/mindi-boot.8192.img"))
 #endif
         {
             mvaddstr_and_log_it(g_currentY++, 74, "No Imgs");
-            if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
+            if (does_file_exist(MINDI_CACHE"/mondorescue.iso")) {
                 popup_and_OK
-                    ("Boot+data floppy creation failed. However, FYI, you may burn /var/cache/mindi/mondorescue.iso to a CD and boot from that instead if you wish.");
+                    ("Boot+data floppy creation failed. However, FYI, you may burn "MINDI_CACHE"/mondorescue.iso to a CD and boot from that instead if you wish.");
                 res++;
             }
         } else {
-            offer_to_write_floppies(bkpinfo, "/var/cache/mindi");
+            offer_to_write_floppies(bkpinfo, MINDI_CACHE);
             mvaddstr_and_log_it(g_currentY++, 74, "Done.");
         }