Changeset 1687 in MondoRescue for branches/2.2.5/mondo/src/common
- Timestamp:
- Oct 20, 2007, 2:47:12 PM (17 years ago)
- Location:
- branches/2.2.5/mondo/src/common
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.5/mondo/src/common/libmondo-archive.c
r1668 r1687 695 695 char *tmp; 696 696 char *tmp1 = NULL; 697 char *tmp2 = NULL; 697 698 char *scratchdir; 698 699 char *command; … … 965 966 strcpy(value, "dvd"); 966 967 break; 968 case usb: 969 strcpy(value, "usb"); 970 break; 967 971 default: 968 972 fatal_error("Unknown backup_media_type"); 969 973 } 974 if (bkpinfo->backup_media_type == usb) { 975 asprintf(&tmp2, "--usb %s", bkpinfo->media_device); 976 } else { 977 asprintf(&tmp2,""); 978 } 979 - 980 970 981 sprintf(tmp, "%s/BACKUP-MEDIA-TYPE", bkpinfo->tmpdir); 971 982 if (write_one_liner_data_file(tmp, value)) { … … 1027 1038 6=\"%s\" 7=%ld 8=\"%s\" 9=\"%s\" 10=\"%s\" \ 1028 1039 11=\"%s\" 12=%s 13=%ld 14=\"%s\" 15=\"%s\" 16=\"%s\" 17=\"%s\" 18=%ld 19=%d",*/ 1029 "mindi --custom %s %s/images '%s' '%s' \1040 "mindi %s --custom %s %s/images '%s' '%s' \ 1030 1041 '%s' %ld '%s' '%s' '%s' \ 1031 '%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s'", bkpinfo->tmpdir, // parameter #21042 '%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s'", tmp2, bkpinfo->tmpdir, // parameter #2 1032 1043 bkpinfo->scratchdir, // parameter #3 1033 1044 bkpinfo->kernel_path, // parameter #4 … … 1323 1334 closeout_tape(); 1324 1335 } else 1325 /* write final ISO */1336 /* write final ISO/USB */ 1326 1337 { 1327 1338 res = write_final_iso_if_necessary(); -
branches/2.2.5/mondo/src/common/libmondo-devices.c
r1659 r1687 407 407 case udev: 408 408 strcpy(output, "udev"); 409 break; 410 case usb: 411 strcpy(output, "usb"); 409 412 break; 410 413 default: … … 1867 1870 case cdrw: 1868 1871 case dvd: 1872 case usb: 1869 1873 if (archiving_to_media) { 1870 if ( bkpinfo->backup_media_type != dvd) {1874 if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) { 1871 1875 if (ask_me_yes_or_no 1872 1876 ("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")) … … 1893 1897 log_msg(1, "Setting to CD defaults"); 1894 1898 } 1895 if ( bkpinfo->backup_media_type != dvd) {1899 if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) { 1896 1900 if (!popup_and_get_string("Speed", comment, tmp, 4)) { 1897 1901 log_to_screen("User has chosen not to backup the PC"); -
branches/2.2.5/mondo/src/common/libmondo-string.c
r1645 r1687 1160 1160 strcpy(type_of_backup, "nfs"); 1161 1161 break; 1162 case usb: 1163 strcpy(type_of_backup, "USB"); 1164 break; 1162 1165 default: 1163 1166 strcpy(type_of_backup, "ISO"); -
branches/2.2.5/mondo/src/common/mondostructures.h
r1295 r1687 189 189 nfs, ///< Back up to an NFS mount on the local subnet. 190 190 tape, ///< Back up to tapes. 191 usb, ///< Back up to USB devices. 191 192 udev ///< Back up to another unsupported device; just send a stream of bytes. 192 193 } t_bkptype; … … 328 329 * The device we're backing up to. 329 330 * If backup_media_type is @b cdr, @b cdrw, or @b cdstream, this should be the SCSI node (e.g. 0,1,0). 330 * If backup_media_type is @b dvd, @b tape, or @b udev, this should be a /dev entry.331 * If backup_media_type is @b dvd, @b tape, @b usb or @b udev, this should be a /dev entry. 331 332 * If backup_media_type is anything else, this should be blank. 332 333 */
Note:
See TracChangeset
for help on using the changeset viewer.