Changeset 2644 in MondoRescue

Timestamp:

Jun 13, 2010, 12:36:19 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3867@localhost: bruno | 2010-06-10 01:35:22 +0200

• Fix compilation issues for mondo

Location:

branches/2.2.10

Files:

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

branches/2.2.10/mindi/mindi

@@ -1902 +1902 @@
     mkdir -p $bigdir/tmp
     if [ $LVM != "false" ]; then
+        mkdir -p $bigdir$MINDI_CACHE
         $MINDI_DATA/analyze-my-lvm > $bigdir$MINDI_CACHE/i-want-my-lvm 
         if [ "$?" -ne "0" ]; then

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

@@ -1711 +1711 @@
         if (bkpinfo->nonbootable_backup) {
             log_msg(1, "Making nonbootable backup");
-            res = eval_call_to_make_ISO(MONDO_MKISOFS"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
+            res = eval_call_to_make_ISO(MONDO_MKISOFS"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, message_to_screen);
         } else {
             log_msg(1, "Making bootable backup");
@@ -1726 +1726 @@
 #ifdef __IA64__
                 log_msg(1, "IA64 --> elilo");
-                res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_ELILO"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
+                res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_ELILO"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, message_to_screen);
 #else
                 log_msg(1, "Non-ia64 --> lilo");
                     // FIXME: fixed boot size probably wrong. lilo to be removed
-                res = eval_call_to_make_ISO(MONDO_MKISOFS"-b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -V _CD#_ .", destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
+                res = eval_call_to_make_ISO(MONDO_MKISOFS"-b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -V _CD#_ .", destfile, g_current_media_number, message_to_screen);
 #endif
             } else {
                 log_msg(1, "make_cd_use_lilo = FALSE");
                 log_msg(1, "Isolinux");
-                res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_SYSLINUX"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
+                res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_SYSLINUX"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, message_to_screen);
             }
         }

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

@@ -643 +643 @@
  * @return 0 for success, nonzero for failure.
  */
-int get_cfg_file_from_initrd()
+void get_cfg_file_from_initrd()
 {
    /** malloc *****/
@@ -714 +714 @@
             if (!does_file_exist(MINDI_CACHE_REL"/mondorestore.cfg")) {
                 log_to_screen("Cannot find config info on media");
-                return (1);
             }
         } else {
@@ -728 +727 @@
         log_msg(1, "%s not found", cfg_file);
         log_to_screen("Oh dear. Unable to recover configuration file from boot disk");
-        return (1);
     }
 
@@ -741 +739 @@
 
     g_backup_media_type = bkpinfo->backup_media_type;
-    return (retval);
 }
 
@@ -1901 +1898 @@
     if (! bkpinfo->disaster_recovery) {
         /* TODO: We need to get mondorestore.cfg and mountlist.txt from initrd.img */
-        get_cfg_file_from_initrd()
+        get_cfg_file_from_initrd();
     }
 }