Changeset 1044 in MondoRescue for branches/stable/mondo/src

Timestamp:

Jan 9, 2007, 12:54:21 AM (17 years ago)

Author:

Bruno Cornec

Message:

We now use consistently /var/cache/mindi everywhere

Location:

branches/stable/mondo/src

Files:

• common/libmondo-archive.c (modified) (3 diffs)
• common/libmondo-filelist.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (1 diff)
• mondoarchive/main.c (modified) (1 diff)

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

@@ -1046 +1046 @@
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
-        sprintf(command, "mkdir -p /root/images/mindi/");
+        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 /root/images/mindi/mondorescue.iso",
+                "cp -f %s/images/mindi.iso /var/cache/mindi/mondorescue.iso",
                 bkpinfo->scratchdir);
         log_msg(2, command);
@@ -2771 +2771 @@
  * @c backup_media_type field is used in this function.
  * @param imagesdir The directory containing the floppy images (usually
- * /root/images/mindi).
+ * /var/cache/mindi).
  *
  * @return The number of errors encountered (0 for success)
@@ -2950 +2950 @@
     if (!bkpinfo->nonbootable_backup) {
 #ifdef __FreeBSD__
-        if (!does_file_exist("/root/images/mindi/mindi-kern.1722.img"))
+        if (!does_file_exist("/var/cache/mindi/mindi-kern.1722.img"))
 #else
-        if (!does_file_exist("/root/images/mindi/mindi-bootroot.1722.img")
-            && !does_file_exist("/root/images/mindi/mindi-boot.1440.img"))
+        if (!does_file_exist("/var/cache/mindi/mindi-bootroot.1722.img")
+            && !does_file_exist("/var/cache/mindi/mindi-boot.1440.img"))
 #endif
         {
             mvaddstr_and_log_it(g_currentY++, 74, "No Imgs");
-            if (does_file_exist("/root/images/mindi/mondorescue.iso")) {
+            if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
                 popup_and_OK
-                    ("Boot+data floppy creation failed. However, FYI, you may burn /root/images/mindi/mondorescue.iso to a CD and boot from that instead if you wish.");
+                    ("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.");
                 res++;
             }
         } else {
-            offer_to_write_floppies(bkpinfo, "/root/images/mindi");
+            offer_to_write_floppies(bkpinfo, "/var/cache/mindi");
             mvaddstr_and_log_it(g_currentY++, 74, "Done.");
         }

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

@@ -1748 +1748 @@
         sprintf(exclude_paths, " %s %s %s %s %s %s . .. \
 " MNT_CDROM " " MNT_FLOPPY " /media/cdrom /media/cdrecorder \
-/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 /tmp /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);
 
         log_msg(2, "Excluding paths = '%s'", exclude_paths);

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

@@ -1087 +1087 @@
 #endif
 
-    if ((Lres = free_space_on_given_partition("/root")) == -1) {
-        Lres = free_space_on_given_partition("/");
-    }
+    Lres = free_space_on_given_partition("/var/cache");
     log_it("Free space on given partition = %ld MB", 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."); 
+              fatal_error("Your /var/cache partition has <50MB free. Please adjust your partition table to something saner."); 
     }
 

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

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