Changeset 3377 in MondoRescue for branches/3.2/mondo/src/common/libmondo-devices.c
- Timestamp:
- May 6, 2015, 1:10:17 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.2/mondo/src/common/libmondo-devices.c
r3375 r3377 327 327 #else 328 328 return 329 !system("mr _parted2fdisk -l 2>/dev/null | grep '^/dev/' | grep -Eqv '(MS|DOS|EFI|FAT|NTFS)'");329 !system("mr-parted2fdisk -l 2>/dev/null | grep '^/dev/' | grep -Eqv '(MS|DOS|EFI|FAT|NTFS)'"); 330 330 #endif 331 331 } … … 364 364 #endif 365 365 366 mr_asprintf(program, "mr _parted2fdisk -l %s 2> /dev/null", drive);366 mr_asprintf(program, "mr-parted2fdisk -l %s 2> /dev/null", drive); 367 367 fin = popen(program, "r"); 368 368 if (!fin) { … … 1729 1729 * Either way, it's an error. 1730 1730 ********/ 1731 mr_asprintf(command, "mr _parted2fdisk -l %s 2>/dev/null|grep -E \"^/dev/\"|awk '{printf(\"%%s \", $1)}END{print \"\"}'", dsf);1731 mr_asprintf(command, "mr-parted2fdisk -l %s 2>/dev/null|grep -E \"^/dev/\"|awk '{printf(\"%%s \", $1)}END{print \"\"}'", dsf); 1732 1732 log_msg(5, "Executing: %s", command); 1733 1733 mr_asprintf(partition_list, "%s", call_program_and_get_last_line_of_output(command)); … … 1795 1795 log_msg(4, "Processing partition: %s", partitions[i]); 1796 1796 /* See if it's swap. If it is, ignore it. */ 1797 mr_asprintf(command, "mr _parted2fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", ndsf, partitions[i]);1797 mr_asprintf(command, "mr-parted2fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", ndsf, partitions[i]); 1798 1798 log_msg(5, " Running: %s", command); 1799 1799 mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command)); … … 2110 2110 2111 2111 t_boot ret = BIOS; 2112 FILE*fd = NULL;2112 DIR *fd = NULL; 2113 2113 2114 2114 #ifdef __IA64__ … … 2116 2116 #endif 2117 2117 /* Try to detect whether we are in fact in UEFI mode */ 2118 /* TODO: find the right trigger */ 2119 fd = fopen("/sys/module/efi", "r"); 2118 fd = opendir("/sys/firmware/efi", "r"); 2120 2119 if (fd != NULL) { 2121 2120 ret = UEFI; 2121 closedir(fd); 2122 2122 } 2123 2123 return(ret); … … 2365 2365 mr_free(tmp); 2366 2366 2367 if (!popup_and_get_string("Tape block size?", "What is the block size of your tape streamer?", sz_size, 15)) { 2367 mr_asprintf(sz_size,"%s",bkpinfo->internal_tape_block_size); 2368 tmp = mr_popup_and_get_string("Tape block size?", "What is the block size of your tape streamer?", sz_size); 2369 if (tmp == NULL) { 2368 2370 log_to_screen("User has chosen not to backup the PC"); 2369 2371 finish(1); 2370 2372 } 2371 bkpinfo->internal_tape_block_size = atol(sz_size); 2373 bkpinfo->internal_tape_block_size = atol(tmp); 2374 mr_free(sz_size); 2375 mr_free(tmp); 2376 2372 2377 if (bkpinfo->internal_tape_block_size <= 0) { 2373 2378 log_to_screen("User has chosen not to backup the PC"); … … 2682 2687 mr_free(tmp); 2683 2688 // NTFS 2684 strcpy(tmp1, call_program_and_get_last_line_of_output("mr _parted2fdisk -l 2>/dev/null | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'"));2689 strcpy(tmp1, call_program_and_get_last_line_of_output("mr-parted2fdisk -l 2>/dev/null | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'")); 2685 2690 if (strlen(tmp1) > 2) { 2686 2691 if (!popup_and_get_string("NTFS partitions", "Please enter/confirm the NTFS partitions you wish to backup as well.", tmp1, MAX_STR_LEN / 4)) { … … 3100 3105 assert(which_device != NULL); 3101 3106 3102 mr_asprintf(list_drives_cmd, "mr _parted2fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s", where_is_root_mounted());3107 mr_asprintf(list_drives_cmd, "mr-parted2fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s", where_is_root_mounted()); 3103 3108 log_it("list_drives_cmd = %s", list_drives_cmd); 3104 3109 … … 3142 3147 } else { 3143 3148 // We need to look on each partition then 3144 mr_asprintf(list_drives_cmd, "mr _parted2fdisk -l 2>/dev/null | grep -E \"^/dev/\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/");3149 mr_asprintf(list_drives_cmd, "mr-parted2fdisk -l 2>/dev/null | grep -E \"^/dev/\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/"); 3145 3150 log_it("list_drives_cmd = %s", list_drives_cmd); 3146 3151 … … 3290 3295 struct stat buf; 3291 3296 #endif 3292 mr_asprintf(command, "mr _parted2fdisk -l %s 2>/dev/null | grep 'EFI GPT'", drive);3297 mr_asprintf(command, "mr-parted2fdisk -l %s 2>/dev/null | grep 'EFI GPT'", drive); 3293 3298 mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command)); 3294 3299 mr_free(command);
Note:
See TracChangeset
for help on using the changeset viewer.