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

Timestamp:

May 7, 2007, 2:07:32 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Fix a Debian packaging bug
• Do not use mindi-boot.2880.img (which may not exist) anymore in mondorestore
• Adds a debuging message for image_devs for mondo
• Adds some useful log info for debugging at restore time in init
• Debian stores its optimised libraries in /lib/i686/cmov now. (Andree Leidenfrost)
• Fix a bug on lsmod | sed. (Andree Leidenfrost). As a consequence, lsmod is not used anymo

re in mindi (except for log). Replaced by /proc/modules. And the MODULES variable is now us
ed to avoid code duplication.

Location:

branches/stable/mondo/src

Files:

• common/libmondo-archive.c (modified) (1 diff)
• common/libmondo-devices.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (2 diffs)

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

@@ -2763 +2763 @@
         if (!does_file_exist("/var/cache/mindi/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.5760.img")
+            && !does_file_exist("/var/cache/mindi/mindi-boot.8192.img"))
 #endif
         {

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

@@ -1979 +1979 @@
     log_it("scratchdir = '%s'", bkpinfo->scratchdir);
     log_it("tmpdir = '%s'", bkpinfo->tmpdir);
+    log_it("image_devs = '%s'", bkpinfo->image_devs);
     log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device,
            bkpinfo->boot_loader);

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -2223 +2223 @@
             }
         } else {
-            mr_msg(2,
+            /* BERLIOS : Useless ? */
+            /* That boot image doesn't always exist where the following method always works 
+            log_msg(2,
                     "gcffa --- looking at mounted CD for mindi-boot.2880.img");
-            /* BERLIOS : Useless ?
             mr_asprintf(&command,
                     "mount " MNT_CDROM
@@ -2232 +2233 @@
             mr_asprintf(&mounted_cfgf_path, "%s/%s", mountpt, cfg_file);
             if (!does_file_exist(mounted_cfgf_path)) {
-                mr_msg(2,
-                        "gcffa --- Plan C, a.k.a. untarring some file from all.tar.gz");
+                log_msg(2,
+                        "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz");
                 mr_asprintf(&command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm"); // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
                 run_program_and_log_output(command, TRUE);