Changeset 86 in MondoRescue for trunk/mondo/mondo
- Timestamp:
- Oct 22, 2005, 12:40:18 AM (18 years ago)
- Location:
- trunk/mondo/mondo
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/mondo/common/libmondo-devices.c
r75 r86 2891 2891 char *tmp; 2892 2892 char *command; 2893 char *fdisk; 2894 struct stat buf; 2893 2895 2894 2896 malloc_string(tmp); 2895 2897 malloc_string(command); 2898 malloc_string(fdisk); 2896 2899 log_msg(0, "Looking for partition table format type"); 2897 sprintf(command, "fdisk -l %s | grep 'EFI GPT'", drive); 2900 // BERLIOS: Do that temporarily: we need to put back parted2fdisk everywhere 2901 #ifdef __IA64__ 2902 sprintf(fdisk, "/usr/local/bin/fdisk"); 2903 if (stat(fdisk, &buf) != 0) { 2904 #endif 2905 sprintf(fdisk, "/sbin/fdisk"); 2906 #ifdef __IA64__ 2907 } 2908 #endif 2909 log_msg(1, "Using %s",fdisk); 2910 sprintf(command, "%s -l %s | grep 'EFI GPT'", fdisk, drive); 2898 2911 strcpy(tmp, call_program_and_get_last_line_of_output(command)); 2899 2912 if (strstr(tmp, "GPT") == NULL) { … … 2905 2918 paranoid_free(command); 2906 2919 paranoid_free(tmp); 2920 paranoid_free(fdisk); 2907 2921 return (output); 2908 2922 } -
trunk/mondo/mondo/mondorestore/mondo-prep.c
r59 r86 885 885 sprintf(program, "newfs_msdos -F 32 %s", device); 886 886 #else 887 #ifdef __IA64__ 888 /* For EFI partitions take fat16 889 * as we want to make small ones */ 890 sprintf(program, "mkfs -t %s -F 16 %s", format, device); 891 #else 887 892 sprintf(program, "mkfs -t %s -F 32 %s", format, device); 893 #endif 888 894 #endif 889 895 res = run_program_and_log_output(program, FALSE);
Note:
See TracChangeset
for help on using the changeset viewer.