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