Changeset 1046 in MondoRescue for trunk/mondo

Timestamp:

Jan 9, 2007, 1:29:21 AM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r1042:1045 $SVN_M/branches/stable

Location:

trunk/mondo/src/common

Files:

• libmondo-archive.c (modified) (1 diff)
• libmondo-filelist.c (modified) (1 diff)
• libmondo-tools.c (modified) (1 diff)

trunk/mondo/src/common/libmondo-archive.c

@@ -2752 +2752 @@
             if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
                 popup_and_OK
-                    ("Boot+data floppy creation failed.\nHowever, you may burn /var/cache/mindi/mondorescue.iso to a CD\nand 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++;
             }

trunk/mondo/src/common/libmondo-filelist.c

@@ -1603 +1603 @@
         tmp2 = call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null");
         mr_asprintf(&exclude_paths, " %s %s %s %s %s %s . .. \
-" MNT_CDROM " " MNT_FLOPPY " /media/cdrom /media/cdrecorder \
+" MNT_CDROM " " MNT_FLOPPY " /media \
 /proc /sys /tmp /var/cache/mondo /var/cache/mindi", excp, tmp, tmp1, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
         mr_free(tmp);

trunk/mondo/src/common/libmondo-tools.c

@@ -880 +880 @@
 #endif
 
-    if ((Lres = free_space_on_given_partition("/var/cache/mondo")) == -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) {
-        fatal_error("Your /var/cache/mondo 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."); 
     }