Changeset 3196 in MondoRescue for branches/3.2/mondo/src/common/libmondo-devices.c
- Timestamp:
- Oct 1, 2013, 8:20:32 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.2/mondo/src/common/libmondo-devices.c
r3194 r3196 1340 1340 } 1341 1341 #ifdef __FreeBSD__ 1342 mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir, 1343 bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number); 1342 if (bkpinfo->netfs_remote_dir) { 1343 // NETFS 1344 mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number); 1345 } else { 1346 // ISO 1347 mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number); 1348 } 1344 1349 mddev = make_vn(mount_cmd); 1345 1350 mr_free(mount_cmd); … … 1347 1352 mr_asprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev); 1348 1353 #else 1349 mr_asprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM); 1354 if (bkpinfo->netfs_remote_dir) { 1355 // NETFS 1356 mr_asprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM); 1357 } else { 1358 // ISO 1359 mr_asprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM); 1360 } 1350 1361 #endif 1351 1362 … … 2549 2560 finish(1); 2550 2561 } 2562 if (bkpinfo->netfs_remote_dir == NULL) { 2563 fatal_error("bkpinfo->netfs_remote_dir shold not be NULL"); 2564 } 2551 2565 strcpy(tmp1, bkpinfo->netfs_remote_dir); 2552 2566 if (!popup_and_get_string … … 2556 2570 finish(1); 2557 2571 } 2572 mr_free(bkpinfo->netfs_remote_dir); 2558 2573 mr_asprintf(bkpinfo->netfs_remote_dir, "%s", tmp1); 2559 2574 … … 2615 2630 break; 2616 2631 default: 2617 fatal_error 2618 ("I, Mojo Jojo, shall defeat those pesky Powerpuff Girls!"); 2632 fatal_error("I, Mojo Jojo, shall defeat those pesky Powerpuff Girls!"); 2619 2633 } 2620 2634
Note:
See TracChangeset
for help on using the changeset viewer.