Changeset 86 in MondoRescue for trunk/mondo/mondo

Timestamp:

Oct 22, 2005, 12:40:18 AM (19 years ago)

Author:

bcornec

Message:

apply patch r83:85 from the 2.04_berlios branch

Location:

trunk/mondo/mondo

Files:

• common/libmondo-devices.c (modified) (2 diffs)
• mondorestore/mondo-prep.c (modified) (1 diff)

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

@@ -2891 +2891 @@
     char *tmp;
     char *command;
+    char *fdisk;
+    struct stat buf;
 
     malloc_string(tmp);
     malloc_string(command);
+    malloc_string(fdisk);
     log_msg(0, "Looking for partition table format type");
-    sprintf(command, "fdisk -l %s | grep 'EFI GPT'", drive);
+// 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
+    log_msg(1, "Using %s",fdisk);
+    sprintf(command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
     if (strstr(tmp, "GPT") == NULL) {
@@ -2905 +2918 @@
     paranoid_free(command);
     paranoid_free(tmp);
+    paranoid_free(fdisk);
     return (output);
 }

trunk/mondo/mondo/mondorestore/mondo-prep.c

@@ -885 +885 @@
         sprintf(program, "newfs_msdos -F 32 %s", device);
 #else
+#ifdef __IA64__
+        /* For EFI partitions take fat16 
+         * as we want to make small ones */
+        sprintf(program, "mkfs -t %s -F 16 %s", format, device);
+#else
         sprintf(program, "mkfs -t %s -F 32 %s", format, device);
+#endif
 #endif
         res = run_program_and_log_output(program, FALSE);