Changeset 1770 in MondoRescue for branches/stable/mondo/src/common/libmondo-tools.c
- Timestamp:
- Nov 6, 2007, 11:01:53 AM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/common/libmondo-tools.c
r1769 r1770 32 32 33 33 extern int g_tape_buffer_size_MB; 34 extern char *g_erase_tmpdir_and_scratchdir;35 34 extern char *g_serial_string; 36 35 extern bool g_text_mode; … … 653 652 } 654 653 655 asprintf(&tmp,"rm -Rf %s/changed.files*",M INDI_CACHE);654 asprintf(&tmp,"rm -Rf %s/changed.files*",MONDO_CACHE); 656 655 run_program_and_log_output(tmp, FALSE); 657 656 paranoid_free(tmp); … … 798 797 assert_string_is_neither_NULL_nor_zerolength(partition); 799 798 800 mr_asprintf(&command, "df -m -P %s &> /dev/null", partition);799 mr_asprintf(&command, "df -m -P %s 1> /dev/null 2> /dev/null", partition); 801 800 if (system(command)) { 802 801 return (-1); … … 838 837 /*@ int's *************** */ 839 838 int retval = 0; 840 long Lres;841 842 839 843 840 mvaddstr_and_log_it(g_currentY, 0, 844 841 "Checking sanity of your Linux distribution"); 845 842 #ifndef __FreeBSD__ 846 if (system("which mkfs.vfat &> /dev/null")847 && !system("which mkfs.msdos &> /dev/null")) {843 if (system("which mkfs.vfat 2> /dev/null 1> /dev/null") 844 && !system("which mkfs.msdos 2> /dev/null 1> /dev/null")) { 848 845 log_it 849 846 ("OK, you've got mkfs.msdos but not mkfs.vfat; time for the fairy to wave her magic wand..."); … … 1225 1222 malloc_string(g_boot_mountpt); 1226 1223 malloc_string(g_tmpfs_mountpt); 1227 malloc_string(g_erase_tmpdir_and_scratchdir);1228 1224 malloc_string(g_serial_string); 1229 1225 malloc_string(g_magicdev_command); … … 1231 1227 mr_free(g_boot_mountpt); 1232 1228 mr_free(g_tmpfs_mountpt); 1233 mr_free(g_erase_tmpdir_and_scratchdir);1234 1229 mr_free(g_serial_string); 1235 1230 mr_free(g_magicdev_command);
Note:
See TracChangeset
for help on using the changeset viewer.