Changeset 1594 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c
- Timestamp:
- Aug 26, 2007, 12:26:06 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c
r1581 r1594 674 674 if (bkpinfo->disaster_recovery 675 675 && does_file_exist("/tmp/CDROM-LIVES-HERE")) { 676 strcpy(bkpinfo->media_device,676 mr_allocstr(bkpinfo->media_device, 677 677 last_line_of_file("/tmp/CDROM-LIVES-HERE")); 678 } else {679 find_cdrom_device(bkpinfo->media_device, TRUE);680 678 } 681 679 … … 725 723 FALSE); 726 724 if (run_program_and_log_output("ls " MNT_RESTORING " /tmp", FALSE)) { 727 run_program_and_log_output("chmod 1777 " MNT_RESTORING "/tmp", 728 FALSE); 725 chmod(MNT_RESTORING "/tmp",1777 ); 729 726 } 730 727 run_program_and_log_output("mkdir -p " MNT_RESTORING 731 728 "/var/run/console", FALSE); 732 run_program_and_log_output("chmod 777 " MNT_RESTORING "/dev/null", 733 FALSE); 729 chmod(MNT_RESTORING "/dev/null",0777); 734 730 run_program_and_log_output("cd " MNT_RESTORING 735 731 "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir \"$i\"/.disabled ; mv -f \"$i\"/.DCOP* \"$i\"/.MCOP* \"$i\"/.*authority \"$i\"/.kde/tmp* \"$i\"/.kde/socket* \"$i\"/.disabled/ ; done", … … 838 834 if (bkpinfo->disaster_recovery) { 839 835 if (bkpinfo->backup_media_type == cdstream) { 840 strcpy(bkpinfo->media_device, "/dev/cdrom"); 841 bkpinfo->media_size = (long)1999*1024; 836 mr_allocstr(bkpinfo->media_device, "/dev/cdrom"); 842 837 bkpinfo->media_size = (long)650; /* good guess */ 843 838 } else if (bkpinfo->backup_media_type == tape … … 846 841 fatal_error("Cannot get tape device name from cfg file"); 847 842 } 848 strcpy(bkpinfo->media_device, value);843 mr_allocstr(bkpinfo->media_device, value); 849 844 read_cfg_var(cfg_file, "media-size", value); 850 845 bkpinfo->media_size = atol(value); … … 852 847 bkpinfo->media_device); 853 848 } else { 854 strcpy(bkpinfo->media_device, "/dev/cdrom"); /* we don't really need this var */ 855 bkpinfo->media_size = (long)1999*1024; /* 650, probably, but we don't need this var anyway */ 849 mr_allocstr(bkpinfo->media_device, "/dev/cdrom"); /* we don't really need this var */ 856 850 bkpinfo->media_size = (long)1999*1024; /* 650, probably, but we don't need this var anyway */ 857 851 mr_msg(2, "Backup medium is CD-R[W]"); … … 1019 1013 "Unable to mount isodir. Perhaps this is really a CD backup?"); 1020 1014 bkpinfo->backup_media_type = cdr; 1021 strcpy(bkpinfo->media_device, "/dev/cdrom"); /* superfluous */1015 mr_allocstr(bkpinfo->media_device, "/dev/cdrom"); /* superfluous */ 1022 1016 bkpinfo->isodir[0] = '\0'; 1023 1017 mr_free(iso_mnt); … … 2150 2144 2151 2145 if (strlen(bkpinfo->media_device) == 0) { 2152 strcpy(bkpinfo->media_device, "/dev/st0");2146 mr_allocstr(bkpinfo->media_device, "/dev/st0"); 2153 2147 mr_msg(2, "media_device is blank; assuming %s", 2154 2148 bkpinfo->media_device); … … 2157 2151 if (extract_cfg_file_and_mountlist_from_tape_dev 2158 2152 (bkpinfo->media_device)) { 2159 strcpy(bkpinfo->media_device, "/dev/st0");2153 mr_allocstr(bkpinfo->media_device, "/dev/st0"); 2160 2154 if (extract_cfg_file_and_mountlist_from_tape_dev 2161 2155 (bkpinfo->media_device)) { 2162 strcpy(bkpinfo->media_device, "/dev/osst0");2156 mr_allocstr(bkpinfo->media_device, "/dev/osst0"); 2163 2157 if (extract_cfg_file_and_mountlist_from_tape_dev 2164 2158 (bkpinfo->media_device)) { 2165 strcpy(bkpinfo->media_device, "/dev/ht0");2159 mr_allocstr(bkpinfo->media_device, "/dev/ht0"); 2166 2160 if (extract_cfg_file_and_mountlist_from_tape_dev 2167 2161 (bkpinfo->media_device)) { 2168 2162 mr_msg(3, 2169 2163 "I tried lots of devices but none worked."); 2170 strcpy(bkpinfo->media_device, tmp);2164 mr_allocstr(bkpinfo->media_device, tmp); 2171 2165 } 2172 2166 }
Note:
See TracChangeset
for help on using the changeset viewer.