Changeset 196 in MondoRescue for branches/2.05/mondo/mondo/common/libmondo-devices.c

Timestamp:

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

Author:

bcornec

Message:

Usage of parted2fdisk instead of fdisk everywhere.
on ia64 this is mandatory, and simplifies the infrastructure
on other archs, it doesn't change anything as parted2fdisk here is a link to fdisk

File:

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

branches/2.05/mondo/mondo/common/libmondo-devices.c

@@ -2748 +2748 @@
 
     sprintf(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);
@@ -2904 +2903 @@
     malloc_string(fdisk);
     log_msg(0, "Looking for partition table format type");
-// BERLIOS: Do that temporarily: we need to put back parted2fdisk everywhere
-#ifdef __IA64__
-    sprintf(fdisk, "/usr/local/bin/fdisk");
-    if (stat(fdisk, &buf) != 0) {
-#endif
-        sprintf(fdisk, "/sbin/fdisk");
-#ifdef __IA64__
-    }
-#endif
+    sprintf(fdisk, "/sbin/parted2fdisk");
     log_msg(1, "Using %s", fdisk);
     sprintf(command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);