Changeset 148 in MondoRescue for branches/2.05/mondo/mondo/mondorestore/mondo-rstr-tools.c
- Timestamp:
- Dec 2, 2005, 8:22:32 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.05/mondo/mondo/mondorestore/mondo-rstr-tools.c
r128 r148 735 735 } 736 736 #ifdef __FreeBSD__ 737 sprintf(mount_cmd, "/mnt/isodir/%s/%s/% d.iso", bkpinfo->isodir,738 bkpinfo->nfs_remote_dir, g_current_media_number);737 sprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir, 738 bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number); 739 739 mddev = make_vn(mount_cmd); 740 740 sprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev); 741 741 #else 742 sprintf(mount_cmd, "mount %s/%s/% d.iso -t iso9660 -o loop,ro %s",742 sprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", 743 743 bkpinfo->isodir, bkpinfo->nfs_remote_dir, 744 g_current_media_number, MNT_CDROM);744 bkpinfo->prefix, g_current_media_number, MNT_CDROM); 745 745 #endif 746 746 … … 748 748 if (bkpinfo->backup_media_type == iso) { 749 749 #ifdef __FreeBSD__ 750 sprintf(mount_cmd, "%s/% d.iso", bkpinfo->isodir,751 g_current_media_number);750 sprintf(mount_cmd, "%s/%s-%d.iso", bkpinfo->isodir, 751 bkpinfo->prefix, g_current_media_number); 752 752 mddev = make_vn(mount_cmd); 753 753 sprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM); 754 754 #else 755 sprintf(mount_cmd, "mount %s/% d.iso -t iso9660 -o loop,ro %s",756 bkpinfo->isodir, g_current_media_number, MNT_CDROM);755 sprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", 756 bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM); 757 757 #endif 758 758 } else if (strstr(bkpinfo->media_device, "/dev/")) … … 1034 1034 } else { 1035 1035 bkpinfo->backup_media_type = iso; 1036 if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) { 1037 strcpy(bkpinfo->prefix,value); 1038 } else { 1039 strcpy(bkpinfo->prefix,STD_PREFIX); 1040 } 1036 1041 } 1037 1042 } 1038 1043 } else if (!strcmp(value, "nfs")) { 1039 1044 bkpinfo->backup_media_type = nfs; 1045 if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) { 1046 strcpy(bkpinfo->prefix,value); 1047 } else { 1048 strcpy(bkpinfo->prefix,STD_PREFIX); 1049 } 1040 1050 } else if (!strcmp(value, "tape")) { 1041 1051 bkpinfo->backup_media_type = tape; … … 1200 1210 } 1201 1211 } 1202 /* bkpinfo->isodir should now be the true path to 1.iso etc... */1212 /* bkpinfo->isodir should now be the true path to prefix-1.iso etc... */ 1203 1213 if (bkpinfo->backup_media_type == iso) { 1204 1214 sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
Note:
See TracChangeset
for help on using the changeset viewer.