Changeset 2644


Ignore:
Timestamp:
Jun 13, 2010, 12:36:19 PM (9 years ago)
Author:
bruno
Message:

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

  • Fix compilation issues for mondo
Location:
branches/2.2.10
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.10/mindi/mindi

    r2643 r2644  
    19021902    mkdir -p $bigdir/tmp
    19031903    if [ $LVM != "false" ]; then
     1904        mkdir -p $bigdir$MINDI_CACHE
    19041905        $MINDI_DATA/analyze-my-lvm > $bigdir$MINDI_CACHE/i-want-my-lvm
    19051906        if [ "$?" -ne "0" ]; then
  • branches/2.2.10/mondo/src/common/libmondo-archive.c

    r2643 r2644  
    17111711        if (bkpinfo->nonbootable_backup) {
    17121712            log_msg(1, "Making nonbootable backup");
    1713             res = eval_call_to_make_ISO(MONDO_MKISOFS"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
     1713            res = eval_call_to_make_ISO(MONDO_MKISOFS"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, message_to_screen);
    17141714        } else {
    17151715            log_msg(1, "Making bootable backup");
     
    17261726#ifdef __IA64__
    17271727                log_msg(1, "IA64 --> elilo");
    1728                 res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_ELILO"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
     1728                res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_ELILO"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, message_to_screen);
    17291729#else
    17301730                log_msg(1, "Non-ia64 --> lilo");
    17311731                    // FIXME: fixed boot size probably wrong. lilo to be removed
    1732                 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);
     1732                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);
    17331733#endif
    17341734            } else {
    17351735                log_msg(1, "make_cd_use_lilo = FALSE");
    17361736                log_msg(1, "Isolinux");
    1737                 res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_SYSLINUX"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
     1737                res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_SYSLINUX"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, message_to_screen);
    17381738            }
    17391739        }
  • branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

    r2623 r2644  
    643643 * @return 0 for success, nonzero for failure.
    644644 */
    645 int get_cfg_file_from_initrd()
     645void get_cfg_file_from_initrd()
    646646{
    647647   /** malloc *****/
     
    714714            if (!does_file_exist(MINDI_CACHE_REL"/mondorestore.cfg")) {
    715715                log_to_screen("Cannot find config info on media");
    716                 return (1);
    717716            }
    718717        } else {
     
    728727        log_msg(1, "%s not found", cfg_file);
    729728        log_to_screen("Oh dear. Unable to recover configuration file from boot disk");
    730         return (1);
    731729    }
    732730
     
    741739
    742740    g_backup_media_type = bkpinfo->backup_media_type;
    743     return (retval);
    744741}
    745742
     
    19011898    if (! bkpinfo->disaster_recovery) {
    19021899        /* TODO: We need to get mondorestore.cfg and mountlist.txt from initrd.img */
    1903         get_cfg_file_from_initrd()
     1900        get_cfg_file_from_initrd();
    19041901    }
    19051902}
Note: See TracChangeset for help on using the changeset viewer.