Changeset 1903 in MondoRescue for branches/stable/mondo/src/common/libmondo-tools.c

Timestamp:

Apr 10, 2008, 1:13:58 AM (16 years ago)

Author:

Bruno Cornec

Message:

merge -r 1842:1889 2.2.5

File:

• branches/stable/mondo/src/common/libmondo-tools.c (modified) (1 diff)

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

@@ -901 +901 @@
 
     // abort if Windows partition but no ms-sys and parted
-    if (!run_program_and_log_output
-        ("mount | grep -w vfat | grep -vE \"/dev/fd|nexdisk\"", 0)
-        ||
-        !run_program_and_log_output
-        ("mount | grep -w dos | grep -vE \"/dev/fd|nexdisk\"", 0)) {
+    if (!run_program_and_log_output("mount | grep -Ew 'vfat|fat|dos' | grep -vE \"/dev/fd|nexdisk\"", 0)) {
         log_to_screen(_("I think you have a Windows 9x partition."));
         retval += whine_if_not_found("parted");
-#ifndef __IA64__
-        /* IA64 always has one vfat partition for EFI even without Windows */
-        // retval += 
-        if (!find_home_of_exe("ms-sys")) {
-            log_to_screen("Please install ms-sys just in case.");
-        }
-#endif
     }