Changeset 1737 in MondoRescue for branches/2.2.5/mondo/src
- Timestamp:
- Oct 30, 2007, 2:40:09 AM (17 years ago)
- Location:
- branches/2.2.5/mondo/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.5/mondo/src/common/libmondo-devices.c
r1709 r1737 1912 1912 } 1913 1913 } 1914 /* No break because we continue even for usb */ 1914 1915 case cdstream: 1915 if ( bkpinfo->disaster_recovery) {1916 if ((bkpinfo->disaster_recovery) && (bkpinfo->backup_media_type != usb)) { 1916 1917 strcpy(bkpinfo->media_device, "/dev/cdrom"); 1917 1918 log_msg(2, "CD-ROM device assumed to be at %s", 1918 1919 bkpinfo->media_device); 1919 } else if ( bkpinfo->restore_data1920 } else if ((bkpinfo->restore_data && (bkpinfo->backup_media_type != usb)) 1920 1921 || bkpinfo->backup_media_type == dvd) { 1921 1922 if (!bkpinfo->media_device[0]) { … … 1942 1943 bkpinfo->media_device); 1943 1944 } else { 1944 if ( find_cdrw_device(bkpinfo->media_device)) {1945 if ((find_cdrw_device(bkpinfo->media_device)) && (bkpinfo->backup_media_type != usb)) { 1945 1946 bkpinfo->media_device[0] = '\0'; 1946 1947 } … … 1955 1956 } 1956 1957 if (!bkpinfo->media_device[0]) { 1957 if (g_kernel_version < 2.6) { 1958 i = popup_and_get_string("Device node?", 1958 if (bkpinfo->backup_media_type == usb) { 1959 i = popup_and_get_string("/dev entry?", 1960 "What is the /dev entry of your USB Disk/Key, please?", 1961 bkpinfo->media_device, 1962 MAX_STR_LEN / 4); 1963 } else { 1964 if (g_kernel_version < 2.6) { 1965 i = popup_and_get_string("Device node?", 1959 1966 "What is the SCSI node of your CD (re)writer, please?", 1960 bkpinfo->media_device,1961 MAX_STR_LEN / 4);1962 } else {1963 if (bkpinfo->backup_media_type == usb) {1964 i = popup_and_get_string("/dev entry?",1965 "What is the /dev entry of your USB Disk/Key, please?",1966 1967 bkpinfo->media_device, 1967 1968 MAX_STR_LEN / 4); -
branches/2.2.5/mondo/src/common/libmondo-tools.c
r1708 r1737 1112 1112 "Checking sanity of your Linux distribution"); 1113 1113 #ifndef __FreeBSD__ 1114 if (system("which mkfs.vfat &> /dev/null")1115 && !system("which mkfs.msdos &> /dev/null")) {1114 if (system("which mkfs.vfat 2> /dev/null 1> /dev/null") 1115 && !system("which mkfs.msdos 2> /dev/null 1> /dev/null")) { 1116 1116 log_it 1117 1117 ("OK, you've got mkfs.msdos but not mkfs.vfat; time for the fairy to wave her magic wand..."); -
branches/2.2.5/mondo/src/mondoarchive/mondo-cli.c
r1702 r1737 805 805 strncpy(bkpinfo->isodir, flag_val['d'], MAX_STR_LEN / 4); 806 806 sprintf(tmp, "ls -l %s", bkpinfo->isodir); 807 if (run_program_and_log_output(tmp, FALSE)) {807 if (run_program_and_log_output(tmp, 2)) { 808 808 fatal_error 809 809 ("output folder does not exist - please create it"); … … 820 820 sprintf(tmp, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir, 821 821 bkpinfo->nfs_remote_dir); 822 if (run_program_and_log_output(tmp, FALSE)) {822 if (run_program_and_log_output(tmp, 2)) { 823 823 retval++; 824 824 sprintf(tmp, … … 930 930 if (flag_set['L']) { 931 931 bkpinfo->use_lzo = TRUE; 932 if (run_program_and_log_output("which lzop", FALSE)) {932 if (run_program_and_log_output("which lzop", 2)) { 933 933 retval++; 934 934 log_to_screen … … 939 939 if (flag_set['G']) { 940 940 bkpinfo->use_gzip = TRUE; 941 if (run_program_and_log_output("which gzip", FALSE)) {941 if (run_program_and_log_output("which gzip", 2)) { 942 942 retval++; 943 943 log_to_screen … … 949 949 && 950 950 !run_program_and_log_output 951 ("grep -Ei suse /etc/issue.net | grep -E '9.0' | grep 64", TRUE)) {951 ("grep -Ei suse /etc/issue.net | grep -E '9.0' | grep 64", 2)) { 952 952 bkpinfo->make_cd_use_lilo = TRUE; 953 953 log_to_screen … … 966 966 ("using LILO instead of SYSLINUX as the CD/floppy's boot loader."); 967 967 } 968 if (run_program_and_log_output("which mkfs.vfat", FALSE)) {968 if (run_program_and_log_output("which mkfs.vfat", 2)) { 969 969 bkpinfo->make_cd_use_lilo = TRUE; 970 970 #ifdef __IA32__
Note:
See TracChangeset
for help on using the changeset viewer.