Changeset 3205 in MondoRescue for branches/3.2/mondo/src/common/libmondo-devices.c
- Timestamp:
- Dec 6, 2013, 3:40:47 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.2/mondo/src/common/libmondo-devices.c
r3196 r3205 2561 2561 } 2562 2562 if (bkpinfo->netfs_remote_dir == NULL) { 2563 fatal_error("bkpinfo->netfs_remote_dir sho ld not be NULL");2563 fatal_error("bkpinfo->netfs_remote_dir should not be NULL"); 2564 2564 } 2565 2565 strcpy(tmp1, bkpinfo->netfs_remote_dir); … … 2584 2584 } 2585 2585 log_msg(3, "prefix set to %s", bkpinfo->prefix); 2586 2587 2586 log_msg(3, "Just set netfs_remote_dir to %s", bkpinfo->netfs_remote_dir); 2588 2587 log_msg(3, "isodir is still %s", bkpinfo->isodir); … … 2688 2687 bkpinfo->boot_loader = i; 2689 2688 2690 mr_free(bkpinfo->include_paths); 2691 strcpy(tmp1, "/"); 2689 if (bkpinfo->include_paths) { 2690 strcpy(tmp1, bkpinfo->include_paths); 2691 mr_free(bkpinfo->include_paths); 2692 } else { 2693 strcpy(tmp1, "/"); 2694 } 2692 2695 if (!popup_and_get_string 2693 2696 ("Backup paths", … … 2831 2834 log_it("compression = %ld", bkpinfo->compression_level); 2832 2835 log_it("exclude_path = %s", bkpinfo->exclude_paths); 2833 log_it("include_path = %s", bkpinfo->include_paths); 2836 if (bkpinfo->include_paths) { 2837 log_it("include_path = %s", bkpinfo->include_paths); 2838 } 2834 2839 2835 2840 /* Handle devices passed in bkpinfo and print result */ … … 3010 3015 * The mountpoint (where it's mounted) will obviously be '/'. 3011 3016 */ 3012 char *where_is_root_mounted() 3013 { 3014 3015 3017 char *where_is_root_mounted() { 3018 3019 /*@ buffers **************** */ 3020 static char tmp[MAX_STR_LEN]; 3016 3021 3017 3022 3018 3023 #ifdef __FreeBSD__ 3019 strcpy(tmp, call_program_and_get_last_line_of_output 3020 ("mount | grep \" on / \" | cut -d' ' -f1")); 3024 strcpy(tmp, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1")); 3021 3025 #else 3022 strcpy(tmp, call_program_and_get_last_line_of_output 3023 ("mount | grep \" on / \" | cut -d' ' -f1 | sed s/[0-9]// | sed s/[0-9]//")); 3026 strcpy(tmp, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1 | sed s/[0-9]// | sed s/[0-9]//")); 3024 3027 if (strstr(tmp, "/dev/cciss/")) { 3025 strcpy(tmp, call_program_and_get_last_line_of_output 3026 ("mount | grep \" on / \" | cut -d' ' -f1 | cut -dp -f1")); 3028 strcpy(tmp, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1 | cut -dp -f1")); 3027 3029 } 3028 3030 if (strstr(tmp, "/dev/md")) { 3029 strcpy(tmp, 3030 call_program_and_get_last_line_of_output 3031 ("mount | grep \" on / \" | cut -d' ' -f1")); 3032 } 3033 #endif 3034 3035 return (tmp); 3031 strcpy(tmp, call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1")); 3032 } 3033 #endif 3034 3035 return (tmp); 3036 3036 } 3037 3037
Note:
See TracChangeset
for help on using the changeset viewer.