Changeset 1438 in MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

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

Location:

branches/stable

Files:

• mondo/src/common/libmondo-archive.c (modified) (3 diffs)
• mondo/src/common/libmondo-filelist.c (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (1 diff)
• mondo/src/include/my-stuff.h (modified) (1 diff)
• mondo/src/mondoarchive/mondoarchive.c (modified) (1 diff)
• website/announces3.sql (modified) ( previous)

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.");
         }

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

@@ -1582 +1582 @@
         sprintf(exclude_paths, " %s %s %s %s %s %s . .. \
 " MNT_CDROM " " MNT_FLOPPY " /media \
-/proc /sys /tmp /var/log/lastlog /root/images/mondo /var/cache/mindi ", excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+/proc /sys /tmp /var/log/lastlog /root/images/mondo " MINDI_CACHE " " MONDO_CACHE, excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
 
         mr_msg(2, "Excluding paths = '%s'", exclude_paths);

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

@@ -851 +851 @@
 #endif
 
-    Lres = free_space_on_given_partition("/var/cache");
+    Lres = free_space_on_given_partition(MONDO_CACHE);
     log_it("Free space on given partition = %ld MB", Lres);
 
     if (Lres < 50) {
-        fatal_error("Your /var/cache partition has <50MB free. Please adjust your partition table to something saner."); 
+        fatal_error("Your "MONDO_CACHE" partition has <50MB free. Please adjust your partition table to something saner or make "MONDO_CACHE" a symbolic link"); 
     }
 

branches/stable/mondo/src/include/my-stuff.h

@@ -16 +16 @@
 /* Hardcoded: Bad for the moment */
 #define MONDO_CACHE "/var/cache/mondo"
+#define MINDI_CACHE "/var/cache/mindi"
 #define MONDORESTORECFG MONDO_CACHE"/mondo-restore.cfg"
 /**

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -531 +531 @@
     }
 
-    if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
+    if (does_file_exist(MINDI_CACHE"/mondorescue.iso")) {
         log_to_screen
-            (_("/var/cache/mindi/mondorescue.iso, a boot/utility CD, is available if you want it."));
+            (_(MINDI_CACHE"/mondorescue.iso, a boot/utility CD, is available if you want it."));
     }