Ignore:
Timestamp:
Apr 10, 2008, 1:13:58 AM (11 years ago)
Author:
bruno
Message:

merge -r 1842:1889 2.2.5

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/src/common/libmondo-tools.c

    r1842 r1903  
    901901
    902902    // abort if Windows partition but no ms-sys and parted
    903     if (!run_program_and_log_output
    904         ("mount | grep -w vfat | grep -vE \"/dev/fd|nexdisk\"", 0)
    905         ||
    906         !run_program_and_log_output
    907         ("mount | grep -w dos | grep -vE \"/dev/fd|nexdisk\"", 0)) {
     903    if (!run_program_and_log_output("mount | grep -Ew 'vfat|fat|dos' | grep -vE \"/dev/fd|nexdisk\"", 0)) {
    908904        log_to_screen(_("I think you have a Windows 9x partition."));
    909905        retval += whine_if_not_found("parted");
    910 #ifndef __IA64__
    911         /* IA64 always has one vfat partition for EFI even without Windows */
    912         // retval +=
    913         if (!find_home_of_exe("ms-sys")) {
    914             log_to_screen("Please install ms-sys just in case.");
    915         }
    916 #endif
    917906    }
    918907
Note: See TracChangeset for help on using the changeset viewer.