Changeset 1924 in MondoRescue for branches/stable/mondo/src/common/libmondo-tools.c
- Timestamp:
- Apr 18, 2008, 1:41:41 AM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/common/libmondo-tools.c
r1903 r1924 21 21 #include "libmondo-fork-EXT.h" 22 22 #include "libmondo-raid-EXT.h" 23 #include "libmondo-devices-EXT.h" 23 24 #include <sys/socket.h> 24 25 #include <netdb.h> … … 78 79 79 80 extern bool am_I_in_disaster_recovery_mode(void); 81 82 /* Return a string containing the date */ 83 char *mr_date(void) { 84 85 time_t tcurr; 86 87 tcurr = time(NULL); 88 return(ctime(&tcurr)); 89 } 90 91 /*-----------------------------------------------------------*/ 80 92 81 93 … … 692 704 strcpy(bkpinfo->tmpdir,p); 693 705 paranoid_free(tmp); 694 695 //sprintf(bkpinfo->tmpdir, "%s/tmpfs/mondo.tmp.%d", "/tmp", (int) (random() % 32768)); // for mondorestore696 706 } 697 707 … … 711 721 memset((void *) bkpinfo, 0, sizeof(struct s_bkpinfo)); 712 722 713 /* special case for tmpdir as used eveywhere after */ 714 setup_tmpdir(NULL); 723 sensibly_set_tmpdir_and_scratchdir(); 715 724 716 725 bkpinfo->manual_tray = mr_conf->manual_tray; … … 764 773 bkpinfo->prefix = tmp; 765 774 766 bkpinfo->scratchdir[0] = '\0';767 775 bkpinfo->make_filelist = TRUE; // unless -J supplied to mondoarchive 768 776 bkpinfo->optimal_set_size = 0; … … 823 831 * - make sure afio, cdrecord, bzip2, awk, md5sum, strings, mindi, and buffer exist 824 832 * - make sure CD-ROM is unmounted 825 * - make sure /etc/modules.conf exists826 833 * - make sure user's mountlist is OK by running <tt>mindi --makemountlist</tt> 827 834 * … … 940 947 } 941 948 mr_free(tmp); 942 #ifndef __FreeBSD__943 if (!does_file_exist("/etc/modules.conf")) {944 if (does_file_exist("/etc/conf.modules")) {945 log_it("Linking /etc/modules.conf to /etc/conf.modules");946 run_program_and_log_output947 ("ln -sf /etc/conf.modules /etc/modules.conf", 5);948 } else if (does_file_exist("/etc/modprobe.d")) {949 log_it950 ("Directory /etc/modprobe.d found. mindi will use its contents.");951 } else if (does_file_exist("/etc/modprobe.conf")) {952 log_it("Linking /etc/modules.conf to /etc/modprobe.conf");953 run_program_and_log_output954 ("ln -sf /etc/modprobe.conf /etc/modules.conf", 5);955 } else {956 retval++;957 log_to_screen958 (_("Please find out what happened to /etc/modules.conf"));959 }960 }961 #endif962 949 963 950 run_program_and_log_output("cat /etc/fstab", 5);
Note:
See TracChangeset
for help on using the changeset viewer.