Changeset 197 in MondoRescue for trunk/mondo/mondo/common/libmondo-devices.c

Timestamp:

Dec 14, 2005, 12:12:15 AM (18 years ago)

Author:

bcornec

Message:

merge -r193:196 $SVN_M/branches/2.05

File:

• trunk/mondo/mondo/common/libmondo-devices.c (modified) (2 diffs)

trunk/mondo/mondo/common/libmondo-devices.c

@@ -2264 +2264 @@
     assert(which_device != NULL);
     asprintf(&list_drives_cmd,
-            // "parted2fdisk
-            "fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s",
+            "parted2fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s",
             where_is_root_mounted());
     log_it("list_drives_cmd = %s", list_drives_cmd);
@@ -2419 +2418 @@
 
     log_msg(0, "Looking for partition table format type");
-// BERLIOS: Do that temporarily: we need to put back parted2fdisk everywhere
-#ifdef __IA64__
-    struct stat buf;
-
-    asprintf(&fdisk, "/usr/local/bin/fdisk");
-    if (stat(fdisk, &buf) != 0) {
-        paranoid_free(fdisk);
-#endif
-        asprintf(&fdisk, "/sbin/fdisk");
-#ifdef __IA64__
-    }
-#endif
+    asprintf(&fdisk, "/sbin/parted2fdisk");
     log_msg(1, "Using %s", fdisk);
     asprintf(&command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);