Changeset 2847 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-devices.c
- Timestamp:
- Jul 5, 2011, 3:26:49 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.9/mondo/src/common/libmondo-devices.c
r2836 r2847 2170 2170 char *tmp1 = NULL; 2171 2171 char *mds = NULL; 2172 char *q = NULL; 2172 2173 char p[8*MAX_STR_LEN]; 2173 2174 char *sz_size; … … 2475 2476 if (bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] == '/') 2476 2477 bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] = '\0'; 2478 q = strchr(bkpinfo->netfs_mount, '@'); 2479 if (q != NULL) { 2480 /* User found. Store the 2 values */ 2481 q++; 2482 /* new netfs mount */ 2483 strcpy(tmp,q); 2484 } else { 2485 strcpy(tmp,bkpinfo->netfs_mount); 2486 } 2477 2487 sprintf(command, "mount | grep \"%s \" | cut -d' ' -f3", 2478 bkpinfo->netfs_mount);2488 tmp); 2479 2489 strcpy(bkpinfo->isodir, 2480 2490 call_program_and_get_last_line_of_output(command)); … … 2523 2533 } 2524 2534 2535 if (bkpinfo->netfs_user) { 2536 strcpy(tmp1, bkpinfo->netfs_user); 2537 } else { 2538 strcpy(tmp1, ""); 2539 } 2540 if (!popup_and_get_string 2541 ("Network user", "Which user should I use if any ?", 2542 tmp1, MAX_STR_LEN)) { 2543 log_to_screen("User has chosen not to backup the PC"); 2544 finish(1); 2545 } 2546 mr_free(bkpinfo->netfs_user); 2547 if (strcmp(tmp1, "") != 0) { 2548 mr_asprintf(&(bkpinfo->netfs_user), "%s", tmp1); 2549 } 2550 2525 2551 /* Initiate bkpinfo isodir path from running environment if mount already done */ 2526 2552 if (is_this_device_mounted(bkpinfo->netfs_mount)) { … … 2534 2560 if (bkpinfo->restore_data) { 2535 2561 if (strstr(bkpinfo->netfs_proto, "sshfs")) { 2536 mr_asprintf(&tmp, "sshfs -o ro %s %s", bkpinfo->netfs_mount, bkpinfo->isodir);2562 mr_asprintf(&tmp, "sshfs -o ro"); 2537 2563 } else { 2538 mr_asprintf(&tmp, "mount -t %s -o nolock,ro %s %s", bkpinfo->netfs_proto, bkpinfo->netfs_mount, bkpinfo->isodir);2564 mr_asprintf(&tmp, "mount -t %s -o nolock,ro", bkpinfo->netfs_proto); 2539 2565 } 2540 2566 } else { 2541 2567 if (strstr(bkpinfo->netfs_proto, "sshfs")) { 2542 mr_asprintf(&tmp, "sshfs %s %s", bkpinfo->netfs_mount, bkpinfo->isodir);2568 mr_asprintf(&tmp, "sshfs"); 2543 2569 } else { 2544 mr_asprintf(&tmp, "mount -t %s -o nolock %s %s", bkpinfo->netfs_proto, bkpinfo->netfs_mount, bkpinfo->isodir);2570 mr_asprintf(&tmp, "mount -t %s -o nolock", bkpinfo->netfs_proto); 2545 2571 } 2546 2572 } 2573 if (bkpinfo->netfs_user) { 2574 mr_strcat(tmp, "%s@", bkpinfo->netfs_user); 2575 } 2576 mr_strcat(tmp, "%s %s", bkpinfo->netfs_mount, bkpinfo->isodir); 2547 2577 run_program_and_log_output(tmp, 3); 2548 2578 mr_free(tmp);
Note:
See TracChangeset
for help on using the changeset viewer.