Changeset 2635 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-devices.c
- Timestamp:
- May 17, 2010, 5:57:40 AM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/common/libmondo-devices.c
r2623 r2635 120 120 121 121 tmp = where_is_root_mounted(); 122 log_msg(0, "root is currently mounted at %s \n", tmp);122 log_msg(0, "root is currently mounted at %s", tmp); 123 123 124 124 #ifdef __FreeBSD__ … … 1877 1877 while (DSFptr != NULL) { 1878 1878 if (DSFptr->check) { 1879 log_msg (4, "%s is mounted on %s and is on disk %s \n", DSFptr->device, DSFptr->mount_point, ndsf);1879 log_msg (4, "%s is mounted on %s and is on disk %s", DSFptr->device, DSFptr->mount_point, ndsf); 1880 1880 strcat(*included_dsf_list, DSFptr->mount_point); 1881 1881 strcat(*included_dsf_list, " "); 1882 1882 } else { 1883 log_msg (4, "%s is mounted on %s and is NOT on disk %s \n", DSFptr->device, DSFptr->mount_point, ndsf);1883 log_msg (4, "%s is mounted on %s and is NOT on disk %s", DSFptr->device, DSFptr->mount_point, ndsf); 1884 1884 strcat(*excluded_dsf_list, DSFptr->mount_point); 1885 1885 strcat(*excluded_dsf_list, " "); … … 1921 1921 if (mode == 'E') { 1922 1922 if (strlen(mounted_on_dsf)) { 1923 log_to_screen("Excluding the following file systems on %s: \n", token);1924 log_to_screen(" %s\n", mounted_on_dsf);1923 log_to_screen("Excluding the following file systems on %s:", token); 1924 log_to_screen("==> %s", mounted_on_dsf); 1925 1925 log_msg (5, "Adding to bkpinfo->exclude_paths due to -E option: %s", mounted_on_dsf); 1926 1926 mr_strcat(bkpinfo->exclude_paths, " %s ", mounted_on_dsf); … … 1928 1928 } 1929 1929 } else { 1930 log_to_screen("Archiving only the following file systems on %s:\n", token); 1931 log_to_screen(" %s\n", mounted_on_dsf); 1932 strcpy(bkpinfo->include_paths, "/"); 1930 log_to_screen("Archiving only the following file systems on %s:", token); 1931 log_to_screen("==> %s", mounted_on_dsf); 1932 mr_free(bkpinfo->include_paths); 1933 mr_asprintf(bkpinfo->include_paths, "%s", "/"); 1933 1934 if (strlen(not_mounted_on_dsf)) { 1934 1935 log_msg (5, "Adding to bkpinfo->exclude_paths due to -I option: %s", not_mounted_on_dsf); 1935 log_to_screen("Not archiving the following file systems: \n");1936 log_to_screen(" %s\n", not_mounted_on_dsf);1937 mr_strcat(bkpinfo->exclude_paths, " %s ", mounted_on_dsf);1936 log_to_screen("Not archiving the following file systems:"); 1937 log_to_screen("==> %s", not_mounted_on_dsf); 1938 mr_strcat(bkpinfo->exclude_paths, " %s ", not_mounted_on_dsf); 1938 1939 } 1939 1940 } … … 2789 2790 /* Never try to eject a NETFS device */ 2790 2791 bkpinfo->please_dont_eject = TRUE; 2792 /* Force NFS to be the protocol by default */ 2793 if (bkpinfo->netfs_proto == NULL) { 2794 mr_asprintf(bkpinfo->netfs_proto, "nfs"); 2795 } 2791 2796 2792 2797 /* Initiate bkpinfo netfs_mount path from running environment if not already done */ … … 2851 2856 mr_free(command); 2852 2857 2853 p = popup_and_get_string("Network protocol", "Which Network protocol should I use?", bkpinfo->netfs_proto); 2854 if (p == NULL) { 2855 log_to_screen("User has chosen not to backup the PC"); 2856 finish(1); 2857 } 2858 mr_free(bkpinfo->netfs_proto); 2859 bkpinfo->netfs_proto = p; 2860 2861 p = popup_and_get_string("Network share", "Which remote Network share should I mount?", bkpinfo->netfs_mount); 2862 if (p == NULL) { 2863 log_to_screen("User has chosen not to backup the PC"); 2864 finish(1); 2865 } 2866 mr_free(bkpinfo->netfs_mount); 2867 bkpinfo->netfs_mount = p; 2868 } 2858 } 2859 p = popup_and_get_string("Network protocol", "Which Network protocol should I use?", bkpinfo->netfs_proto); 2860 if (p == NULL) { 2861 log_to_screen("User has chosen not to backup the PC"); 2862 finish(1); 2863 } 2864 mr_free(bkpinfo->netfs_proto); 2865 bkpinfo->netfs_proto = p; 2866 2867 p = popup_and_get_string("Network share", "Which remote Network share should I mount?", bkpinfo->netfs_mount); 2868 if (p == NULL) { 2869 log_to_screen("User has chosen not to backup the PC"); 2870 finish(1); 2871 } 2872 mr_free(bkpinfo->netfs_mount); 2873 bkpinfo->netfs_mount = p; 2874 2869 2875 /* Initiate bkpinfo isodir path from running environment if mount already done */ 2870 2876 mr_free(bkpinfo->isodir);
Note:
See TracChangeset
for help on using the changeset viewer.