Changeset 1437 in MondoRescue

Timestamp:

May 10, 2007, 11:41:11 PM (17 years ago)

Author:

andree

Message:

New define 'MINDI_CACHE' set to '/var/cache/mindi' rather than
hardcoding this in the code. Makes it easy to change the location. Also
adjusted some of the messages related to boot floppies or CDs.

(Also added missing debug level to log_debug() call.)

Location:

branches/2.2.4/mondo/src

Files:

• common/libmondo-archive.c (modified) (4 diffs)
• common/libmondo-filelist.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (1 diff)
• common/my-stuff.h (modified) (1 diff)
• mondoarchive/main.c (modified) (1 diff)

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

@@ -1047 +1047 @@
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
-        sprintf(command, "mkdir -p /var/cache/mindi/");
-        log_msg(2, command);
-        run_program_and_log_output(command, FALSE);
-        sprintf(command,
-                "cp -f %s/images/mindi.iso /var/cache/mindi/mondorescue.iso",
-                bkpinfo->scratchdir);
+        sprintf(command, "cp -f %s/images/mindi.iso %s/mondorescue.iso",
+                bkpinfo->scratchdir, MINDI_CACHE);
         log_msg(2, command);
         run_program_and_log_output(command, FALSE);
@@ -2274 +2270 @@
             ftmp = fopen(bigfile_fname, "w");
             if (ftmp == NULL) {
-                log_msg("Unable to write to %s", bigfile_fname);
+                log_msg(3, "Unable to write to %s", bigfile_fname);
                 // So skip it as it doesn't exist
                 continue;
@@ -2779 +2775 @@
  * @c backup_media_type field is used in this function.
  * @param imagesdir The directory containing the floppy images (usually
- * /var/cache/mindi).
+ * /root/images/mindi).
  *
  * @return The number of errors encountered (0 for success)
@@ -2958 +2954 @@
     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
-        if (!does_file_exist("/var/cache/mindi/mindi-bootroot.1722.img")
-            && !does_file_exist("/var/cache/mindi/mindi-boot.1440.img"))
+        if (!does_file_exist(MINDI_CACHE"/mindi-bootroot.1722.img") && !does_file_exist(MINDI_CACHE"/mindi-boot.1440.img"))
 #endif
         {
             mvaddstr_and_log_it(g_currentY++, 74, "No Imgs");
-            if (does_file_exist("/var/cache/mindi/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.");
+            if (does_file_exist(MINDI_CACHE"/mondorescue.iso")) {
+                popup_and_OK
+                    ("No regular Boot+data floppies were created due of space constraints. However, you can burn "MINDI_CACHE"/mondorescue.iso to a CD and boot from that.");
                 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/2.2.4/mondo/src/common/libmondo-filelist.c

@@ -1750 +1750 @@
         sprintf(exclude_paths, " %s %s %s %s %s %s . .. \
 " MNT_CDROM " " MNT_FLOPPY " /media \
-/proc /sys /root/images/mondo /root/images/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 /root/images/mondo MINDI_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);
 
         log_msg(2, "Excluding paths = '%s'", exclude_paths);

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

@@ -1100 +1100 @@
 #endif
 
-    if ((Lres = free_space_on_given_partition("/root")) == -1) {
-        Lres = free_space_on_given_partition("/");
-    }
-    log_it("Free space on given partition = %ld MB", Lres);
+    Lres = free_space_on_given_partition(MINDI_CACHE);
+    log_it("Free space on partition of %s = %ld MB", MINDI_CACHE, Lres);
 
     if (Lres < 50) {
-        run_program_and_log_output
-            ("rm -Rf /root/images/mindi; mkdir -p /home/root/images/mindi; mkdir -p /root/images; ln -sf /home/root/images/mindi /root/images/mindi",
-             3);
-        //      fatal_error("Your / (or /root) partition has <50MB free. Please adjust your partition table to something saner."); 
+        sprintf(tmp, "The partition of %s has <50MB free. Please free up space or enlarge the partition or make %s a symbolic link.", MINDI_CACHE, MINDI_CACHE); 
+        fatal_error(tmp);
     }
 

branches/2.2.4/mondo/src/common/my-stuff.h

@@ -231 +231 @@
  */
 #define MONDO_CFG_FILE_STUB "tmp/mondo-restore.cfg"
+/**
+ * The location where mindi CD and floppy images are stored.
+ */
+#define MINDI_CACHE "/var/cache/mindi"
 
 /**

branches/2.2.4/mondo/src/mondoarchive/main.c

@@ -501 +501 @@
     }
 
-    if (does_file_exist("/root/images/mindi/mondorescue.iso")) {
+    if (does_file_exist(MINDI_CACHE"/mondorescue.iso")) {
         log_to_screen
-            ("/root/images/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.");
     }