Ignore:
Timestamp:
May 26, 2008, 5:35:44 PM (11 years ago)
Author:
bruno
Message:
  • Adds OBDR support (use_obdr field in bkpinfo added, -o option changed to mean OBDR - LILO not usable anyway as a bootloader for ISO images)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.6/mondo/src/common/libmondo-cli.c

    r1945 r1948  
    934934    }
    935935
    936     if (!flag_set['o']
    937         &&
    938         !run_program_and_log_output
    939         ("grep -Ei suse /etc/issue.net | grep -E '9.0' | grep 64", 2)) {
     936    bkpinfo->use_obdr = FALSE;
     937    if (flag_set['o']) {
     938        if (!flag_set['t']) {
     939            log_to_screen("OBDR support is only available for tapes. Use the -t option");
     940            fatal_error("Aborting");
     941        }
     942        bkpinfo->use_obdr = TRUE;
     943    }
     944#ifndef __FreeBSD__
     945    if (!is_this_a_valid_disk_format("vfat")) {
    940946        bkpinfo->make_cd_use_lilo = TRUE;
    941947        log_to_screen
    942             ("Forcing you to use LILO. SuSE 9.0 (64-bit) has a broken mkfs.vfat binary.");
    943     }
    944     if (flag_set['o']) {
     948            ("Your kernel appears not to support vfat filesystems. I am therefore");
     949        log_to_screen
     950            ("using LILO instead of SYSLINUX as the media boot loader.");
     951    }
     952    if (run_program_and_log_output("which mkfs.vfat", 2)) {
    945953        bkpinfo->make_cd_use_lilo = TRUE;
    946     }
    947 #ifndef __FreeBSD__
    948     else {
    949         if (!is_this_a_valid_disk_format("vfat")) {
    950             bkpinfo->make_cd_use_lilo = TRUE;
    951             log_to_screen
    952                 ("Your kernel appears not to support vfat filesystems. I am therefore");
    953             log_to_screen
    954                 ("using LILO instead of SYSLINUX as the media boot loader.");
    955         }
    956         if (run_program_and_log_output("which mkfs.vfat", 2)) {
    957             bkpinfo->make_cd_use_lilo = TRUE;
    958954#ifdef __IA32__
    959             log_to_screen
    960                 ("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
    961             log_to_screen
    962                 ("your boot loader. I shall therefore use LILO instead.");
     955        log_to_screen
     956            ("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
     957        log_to_screen
     958            ("your boot loader. I shall therefore use LILO instead.");
    963959#endif
    964960#ifdef __IA64__
    965             log_to_screen
    966                 ("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
    967             log_to_screen("environment correctly. Please install it.");
    968             fatal_error("Aborting");
     961        log_to_screen
     962            ("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
     963        log_to_screen("environment correctly. Please install it.");
     964        fatal_error("Aborting");
    969965#endif
    970         }
     966    }
    971967#ifdef __IA64__
    972         /* We force ELILO usage on IA64 */
    973         bkpinfo->make_cd_use_lilo = TRUE;
     968    /* We force ELILO usage on IA64 */
     969    bkpinfo->make_cd_use_lilo = TRUE;
    974970#endif
    975     }
    976971#endif
    977972
Note: See TracChangeset for help on using the changeset viewer.