Changeset 2325 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-verify.c
- Timestamp:
- Aug 18, 2009, 3:19:15 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/common/libmondo-verify.c
r2324 r2325 924 924 assert(bkpinfo != NULL); 925 925 926 if (bkpinfo->media_device == NULL) { 927 return(1); 928 } 929 926 930 mr_asprintf(fname, "%s1", bkpinfo->media_device); 927 931 if (is_this_device_mounted(fname)) { … … 1022 1026 assert(bkpinfo != NULL); 1023 1027 1028 if (bkpinfo->media_device == NULL) { 1029 return(1); 1030 } 1031 1024 1032 mr_asprintf(mountpoint, "%s/cdrom", bkpinfo->tmpdir); 1025 mr_asprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number); 1033 if (((bkpinfo->isodir == NULL) && (bkpinfo->nfs_remote_dir == NULL)) || (bkpinfo->prefix == NULL)) { 1034 fatal_error("No iso filename preparation possible"); 1035 } 1036 if (bkpinfo->nfs_remote_dir) { 1037 // NFS 1038 mr_asprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number); 1039 } else { 1040 // ISO 1041 mr_asprintf(fname, "%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number); 1042 } 1026 1043 1027 1044 mkdir(mountpoint, 1777); … … 1106 1123 mr_free(command); 1107 1124 1108 if (!bkpinfo->please_dont_eject 1109 && eject_device(bkpinfo->media_device)) { 1125 if (!bkpinfo->please_dont_eject && eject_device(bkpinfo->media_device)) { 1110 1126 log_msg(2, "Failed to eject CD-ROM drive"); 1111 1127 }
Note:
See TracChangeset
for help on using the changeset viewer.