Changeset 3111 in MondoRescue for branches/3.0/mondo/src/common
- Timestamp:
- May 5, 2013, 4:55:42 AM (11 years ago)
- Location:
- branches/3.0/mondo/src/common
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.0/mondo/src/common/libmondo-cli.c
r3107 r3111 536 536 if (strstr(bkpinfo->netfs_proto, "sshfs")) { 537 537 sprintf(tmp, "sshfs %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount); 538 } else if (strstr(bkpinfo->netfs_proto, "smbfs")) { 539 sprintf(tmp, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user); 538 540 } else if (strstr(bkpinfo->netfs_proto, "nfs")) { 539 541 sprintf(tmp, "mount %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount); … … 545 547 if (strstr(bkpinfo->netfs_proto, "sshfs")) { 546 548 sprintf(tmp, "sshfs %s", bkpinfo->netfs_mount); 549 } else if (strstr(bkpinfo->netfs_proto, "smbfs")) { 550 sprintf(tmp, "mount -t cifs %s", bkpinfo->netfs_mount); 547 551 } else if (strstr(bkpinfo->netfs_proto, "nfs")) { 548 552 sprintf(tmp, "mount %s", bkpinfo->netfs_mount); -
branches/3.0/mondo/src/common/libmondo-devices.c
r3107 r3111 2174 2174 { 2175 2175 char *tmp = NULL; 2176 char *tmpro = NULL; 2176 2177 char *tmp1 = NULL; 2177 2178 char *mds = NULL; … … 2528 2529 strcpy(tmp1, bkpinfo->netfs_proto); 2529 2530 if (!popup_and_get_string 2530 ("Network protocol", "Which protocol should I use (nfs/sshfs ) ?",2531 ("Network protocol", "Which protocol should I use (nfs/sshfs/smbfs) ?", 2531 2532 tmp1, MAX_STR_LEN)) { 2532 2533 log_to_screen("User has chosen not to backup the PC"); … … 2567 2568 sprintf(command, "mkdir -p %s", bkpinfo->isodir); 2568 2569 run_program_and_log_output(command, 5); 2570 2569 2571 if (bkpinfo->restore_data) { 2572 /* mount th FS read-only in restore mode to avoid any erase of whatever */ 2573 mr_asprintf(&tmpro, "-o ro"); 2574 } else { 2575 mr_asprintf(&tmpro, ""); 2576 } 2577 2578 /* Build the mount string */ 2579 if (strstr(bkpinfo->netfs_proto, "smbfs")) { 2580 mr_asprintf(&tmp, "mount -t cifs %s %s %s",bkpinfo->netfs_mount, bkpinfo->isodir,tmpro); 2581 if (bkpinfo->netfs_user) { 2582 mr_strcat(tmp, " -o user=%s", bkpinfo->netfs_user); 2583 } 2584 else { 2570 2585 if (strstr(bkpinfo->netfs_proto, "sshfs")) { 2571 mr_asprintf(&tmp, "sshfs -o ro");2586 mr_asprintf(&tmp, "sshfs %s ",tmpro); 2572 2587 } else { 2573 mr_asprintf(&tmp, "mount -t %s -o nolock ,ro", bkpinfo->netfs_proto);2588 mr_asprintf(&tmp, "mount -t %s -o nolock %s ", bkpinfo->netfs_proto,tmpro); 2574 2589 } 2575 } else { 2576 if (strstr(bkpinfo->netfs_proto, "sshfs")) { 2577 mr_asprintf(&tmp, "sshfs"); 2578 } else { 2579 mr_asprintf(&tmp, "mount -t %s -o nolock", bkpinfo->netfs_proto); 2590 if (bkpinfo->netfs_user) { 2591 mr_strcat(tmp, "%s@", bkpinfo->netfs_user); 2580 2592 } 2581 } 2582 mr_strcat(tmp, " "); 2583 if (bkpinfo->netfs_user) { 2584 mr_strcat(tmp, "%s@", bkpinfo->netfs_user); 2585 } 2586 mr_strcat(tmp, "%s %s", bkpinfo->netfs_mount, bkpinfo->isodir); 2593 mr_strcat(tmp, "%s %s", bkpinfo->netfs_mount, bkpinfo->isodir); 2594 } 2587 2595 run_program_and_log_output(tmp, 3); 2588 2596 mr_free(tmp); … … 2590 2598 malloc_string(g_selfmounted_isodir); 2591 2599 strcpy(g_selfmounted_isodir, bkpinfo->isodir); 2600 } 2592 2601 } 2593 2602 if (!is_this_device_mounted(bkpinfo->netfs_mount)) {
Note:
See TracChangeset
for help on using the changeset viewer.