Changeset 3060 in MondoRescue for branches/3.0/mondo/src/mondorestore/mondo-prep.c
- Timestamp:
- Nov 10, 2012, 5:05:37 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.0/mondo/src/mondorestore/mondo-prep.c
r3057 r3060 110 110 } 111 111 } 112 system("sync");113 system("sync");114 system("sync");112 paranoid_system("sync"); 113 paranoid_system("sync"); 114 paranoid_system("sync"); 115 115 popup_and_OK 116 116 ("I must now reboot. Please leave the boot media in the drive and repeat your actions - e.g. type 'nuke' - and it should work fine."); 117 system("reboot");117 paranoid_system("reboot"); 118 118 } 119 119 } … … 197 197 char *p; 198 198 char *q; 199 char *r; 199 200 200 201 /** int ***************************************************/ … … 272 273 log_msg(1, "OK, rewound i-want-my-lvm. Doing funky stuff..."); 273 274 rewind(fin); 274 for ( fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);fgets(incoming, MAX_STR_LEN - 1, fin)) {275 for (r = fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin) && (r != NULL); r = fgets(incoming, MAX_STR_LEN - 1, fin)) { 275 276 fgetpos(fin, &orig_pos); 276 277 if (incoming[0] != '#') { … … 279 280 if (res && strstr(command, "create") && vacuum_pack) { 280 281 sleep(2); 281 system("sync");282 system("sync");283 system("sync");282 paranoid_system("sync"); 283 paranoid_system("sync"); 284 paranoid_system("sync"); 284 285 } 285 286 if ((p = strstr(incoming, "vgcreate"))) { 286 287 // include next line(s) if they end in /dev (cos we've got a broken i-want-my-lvm) 287 for ( fgets(tmp, MAX_STR_LEN - 1, fin); !feof(fin);fgets(tmp, MAX_STR_LEN - 1, fin)) {288 for (q = fgets(tmp, MAX_STR_LEN - 1, fin); !feof(fin) && (q != NULL); q = fgets(tmp, MAX_STR_LEN - 1, fin)) { 288 289 if (tmp[0] == '#') { 289 290 fsetpos(fin, &orig_pos); … … 393 394 } 394 395 sprintf(tmp, "echo \"%s\" >> /tmp/out.sh", command); 395 system(tmp);396 paranoid_system(tmp); 396 397 sleep(1); 397 398 } … … 410 411 paranoid_free(vgremove_sz); 411 412 // paranoid_free(do_this_last); 412 system("sync");413 system("sync");414 system("sync");413 paranoid_system("sync"); 414 paranoid_system("sync"); 415 paranoid_system("sync"); 415 416 sleep(1); 416 417 log_it("ENDING"); … … 451 452 /** pointers *********************************************************/ 452 453 char *p; 454 char *q; 453 455 454 456 /** init *************************************************************/ … … 480 482 finish(1); 481 483 } 482 for ( fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin)484 for (q = fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin) && (q != NULL) 483 485 && !strstr(incoming, old_mountlist->el[lino].device); 484 fgets(incoming, MAX_STR_LEN - 1, fin));486 q = fgets(incoming, MAX_STR_LEN - 1, fin)); 485 487 if (!feof(fin)) { 486 488 sprintf(tmp, "Investigating %s", 487 489 old_mountlist->el[lino].device); 488 490 log_it(tmp); 489 for ( fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin)491 for (q = fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin) && (q != NULL) 490 492 && !strstr(incoming, "raiddev"); 491 fgets(incoming, MAX_STR_LEN - 1, fin)) {493 q = fgets(incoming, MAX_STR_LEN - 1, fin)) { 492 494 if (strstr(incoming, OSSWAP("device", "drive")) 493 495 && !strchr(incoming, '#')) { … … 778 780 "for plex in `vinum lv -r %s | grep '^P' | tr '\t' ' ' | tr -s ' ' | cut -d' ' -f2`; do echo $plex; done > /tmp/plexes", 779 781 basename(device)); 780 system(program);782 paranoid_system(program); 781 783 if (g_fprep) { 782 784 fprintf(g_fprep, "%s\n", program); … … 792 794 793 795 mr_asprintf(&tmp, "vinum init %s", line); 794 system(tmp);796 paranoid_system(tmp); 795 797 paranoid_free(tmp); 796 798 … … 801 803 802 804 char status[MAX_STR_LEN / 4]; 803 fgets(status, MAX_STR_LEN / 4 - 1, pin); 805 if (fgets(status, MAX_STR_LEN / 4 - 1, pin)) { 806 // FIXME 807 } 804 808 pclose(pin); 805 809 … … 823 827 log_to_screen("Stopping %s", device); 824 828 stop_raid_device(device); 825 system("sync");829 paranoid_system("sync"); 826 830 sleep(1); 827 831 if (g_fprep) { … … 838 842 res = run_program_and_log_output(program, 1); 839 843 log_msg(1, "%s returned %d", program, res); 840 system("sync");844 paranoid_system("sync"); 841 845 sleep(3); 842 846 start_raid_device(device); … … 845 849 } 846 850 } 847 system("sync");851 paranoid_system("sync"); 848 852 sleep(2); 849 853 // log_to_screen("Starting %s", device); … … 851 855 // res = run_program_and_log_output(program, 1); 852 856 // log_msg(1, "%s returned %d", program, res); 853 // system("sync"); sleep(1);854 #endif 855 system("sync");857 // paranoid_system("sync"); sleep(1); 858 #endif 859 paranoid_system("sync"); 856 860 sleep(1); 857 861 newtResume(); … … 917 921 retval += res; 918 922 paranoid_free(program); 919 system("sync");923 paranoid_system("sync"); 920 924 sleep(1); 921 925 return (retval); … … 973 977 log_msg(1, "Stopping all RAID devices"); 974 978 stop_all_raid_devices(mountlist); 975 system("sync");976 system("sync");977 system("sync");979 paranoid_system("sync"); 980 paranoid_system("sync"); 981 paranoid_system("sync"); 978 982 sleep(2); 979 983 log_msg(1, "Prepare soft-RAIDs"); // prep and format too … … 997 1001 } 998 1002 } 999 system("sync");1000 system("sync");1001 system("sync");1003 paranoid_system("sync"); 1004 paranoid_system("sync"); 1005 paranoid_system("sync"); 1002 1006 sleep(2); 1003 1007 // This last step is probably necessary 1004 1008 // log_to_screen("Re-starting software RAIDs..."); 1005 1009 // start_all_raid_devices(mountlist); 1006 // system("sync"); system("sync");system("sync");1010 // paranoid_system("sync"); paranoid_system("sync"); paranoid_system("sync"); 1007 1011 // sleep(5); 1008 1012 // do LVMs now … … 1127 1131 ("Please choose 'yes' to reboot and try again; or 'no' to ignore this warning and continue.")) 1128 1132 { 1129 system("sync");1130 system("sync");1131 system("sync");1132 system("reboot");1133 paranoid_system("sync"); 1134 paranoid_system("sync"); 1135 paranoid_system("sync"); 1136 paranoid_system("reboot"); 1133 1137 } 1134 1138 } else { … … 1140 1144 } 1141 1145 newtSuspend(); 1142 system("clear");1146 paranoid_system("clear"); 1143 1147 newtResume(); 1144 1148 paranoid_free(tmp); … … 1515 1519 char *format; 1516 1520 char *tmp; 1521 char *tmp1 = NULL; 1517 1522 1518 1523 /** end *************************************************************/ … … 1634 1639 } 1635 1640 } 1636 system("sync");1641 paranoid_system("sync"); 1637 1642 #else 1638 1643 log_it("New, kernel-friendly partition remover"); … … 1695 1700 fput_string_one_char_at_a_time(pout_to_fdisk, "w\n"); 1696 1701 paranoid_pclose(pout_to_fdisk); 1697 system("sync");1702 paranoid_system("sync"); 1698 1703 log_msg(0,"------------------- fdisk.log looks like this ------------------"); 1699 1704 sprintf(tmp, "cat %s >> %s", FDISK_LOG, MONDO_LOGFILE); 1700 system(tmp);1705 paranoid_system(tmp); 1701 1706 // mark relevant partition as bootable 1702 1707 mr_asprintf(&tmp1,"make-me-bootable /tmp/mountlist.txt %s noaction",drivename); … … 1704 1709 mr_free(tmp1); 1705 1710 log_msg(0,"------------------- end of fdisk.log... ------------------"); 1706 system("sync");1711 paranoid_system("sync"); 1707 1712 sprintf(tmp, "tail -n6 %s | grep -F \"16: \"", FDISK_LOG); 1708 1713 if (!run_program_and_log_output(tmp, 5)) { … … 2032 2037 } 2033 2038 newtSuspend(); 2034 system("clear");2039 paranoid_system("clear"); 2035 2040 newtResume(); 2036 2041 paranoid_free(drivelist); … … 2314 2319 /** int *************************************************************/ 2315 2320 int retval = 0; 2316 #ifndef __FreeBSD__2317 int res;2318 #endif2319 2321 2320 2322 /** char ************************************************************/ … … 2328 2330 #endif 2329 2331 FILE *fin; 2332 char *q; 2330 2333 int i; 2331 2334 … … 2347 2350 return (1); 2348 2351 } 2349 for ( fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);2350 fgets(incoming, MAX_STR_LEN - 1, fin)) {2352 for (q = fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin) && (q != NULL); 2353 q = fgets(incoming, MAX_STR_LEN - 1, fin)) { 2351 2354 retval += stop_raid_device(incoming); 2352 2355 } … … 2359 2362 return (1); 2360 2363 } 2361 for ( fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);2362 fgets(incoming, MAX_STR_LEN - 1, fin)) {2364 for (q = fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin) && (q != NULL); 2365 q = fgets(incoming, MAX_STR_LEN - 1, fin)) { 2363 2366 for (p = incoming; 2364 2367 *p != '\0' && (*p != 'm' || *(p + 1) != 'd' … … 2368 2371 for (p = dev; *p > 32; p++); 2369 2372 *p = '\0'; 2370 re s= stop_raid_device(dev);2373 retval += stop_raid_device(dev); 2371 2374 } 2372 2375 } … … 2379 2382 paranoid_free(dev); 2380 2383 paranoid_free(incoming); 2381 system("sync");2382 system("sync");2383 system("sync");2384 paranoid_system("sync"); 2385 paranoid_system("sync"); 2386 paranoid_system("sync"); 2384 2387 sleep(1); 2385 2388 return (retval);
Note:
See TracChangeset
for help on using the changeset viewer.