Changeset 1315 in MondoRescue for branches/2.2.2/mondo/src
- Timestamp:
- Apr 16, 2007, 4:13:59 PM (17 years ago)
- Location:
- branches/2.2.2/mondo/src
- Files:
-
- 2 added
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.2/mondo/src/common/libmondo-archive.c
r1299 r1315 1952 1952 } else { 1953 1953 log_to_screen("%s...OK", message_to_screen); 1954 if (!run_program_and_log_output 1955 ("tail -n10 /var/log/mondo-archive.log | grep -F ':-('", 1956 1)) { 1954 sprintf(tmp, "tail -n10 %s | grep -F ':-('", MONDO_LOGFILE); 1955 if (!run_program_and_log_output(tmp, 1)) { 1957 1956 log_to_screen 1958 1957 ("Despite nonfatal errors, growisofs confirms the write was successful."); -
branches/2.2.2/mondo/src/common/my-stuff.h
r1236 r1315 381 381 //#define strcpy(y,x) strncpy(y, x, sizeof(y)-1) 382 382 383 384 /**385 * Compatibility #define to ease the transition to logfile-in-a-variable.386 */387 #define MONDO_LOGFILE "/var/log/mondo-archive.log"388 383 389 384 /** -
branches/2.2.2/mondo/src/common/newt-specific.c
r1294 r1315 435 435 436 436 printf("---FATALERROR--- %s\n", error_string); 437 s ystem438 ("gzip -9c /var/log/mondo-archive.log > /tmp/MA.log.gz 2> /dev/null");437 sprintf(command, "gzip -9c %s > /tmp/MA.log.gz 2> /dev/null", MONDO_LOGFILE); 438 system(command); 439 439 printf 440 440 ("If you require technical support, please contact the mailing list.\n"); -
branches/2.2.2/mondo/src/mondoarchive/Makefile.am
r899 r1315 4 4 5 5 ## Headers 6 noinst_HEADERS = mondo-cli-EXT.h mondo-cli.h 6 noinst_HEADERS = mondo-cli-EXT.h mondo-cli.h mondoarchive.h 7 7 8 8 ## The program -
branches/2.2.2/mondo/src/mondoarchive/main.c
r1274 r1315 117 117 #include "../common/libmondo.h" 118 118 #include "mondo-cli-EXT.h" 119 #include "mondoarchive.h" 119 120 120 121 // for CVS -
branches/2.2.2/mondo/src/mondorestore/Makefile.am
r899 r1315 7 7 mondo-restore-EXT.h mr-externs.h \ 8 8 mondo-rstr-compare-EXT.h mondo-rstr-tools-EXT.h mondoprep.h 9 mondorestore.h 9 10 10 11 ## The program -
branches/2.2.2/mondo/src/mondorestore/mondo-prep.c
r1303 r1315 337 337 /** buffers **********************************************/ 338 338 char *tmp; 339 char *tmp1 = NULL; 339 340 char *incoming; 340 341 char *command; … … 486 487 log_it("%s... so I'll get creative.", tmp); 487 488 if (lvmversion == 2) { 488 strcpy(tmp, call_program_and_get_last_line_of_output 489 ("tail -n5 /var/log/mondo-archive.log | grep Insufficient | tail -n1")); 489 asprintf(&tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE); 490 strcpy(tmp, call_program_and_get_last_line_of_output(tmp1)); 491 free(tmp1); 490 492 } else { 491 strcpy(tmp, call_program_and_get_last_line_of_output 492 ("tail -n5 /var/log/mondo-archive.log | grep lvcreate | tail -n1")); 493 asprintf(&tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE); 494 strcpy(tmp, call_program_and_get_last_line_of_output(tmp1)); 495 free(tmp1); 493 496 } 494 497 for (p = tmp; *p != '\0' && !isdigit(*p); p++); -
branches/2.2.2/mondo/src/mondorestore/mondo-restore.c
r1295 r1315 18 18 #include "mr-externs.h" 19 19 #include "mondo-restore.h" 20 #include "mondorestore.h" 20 21 #include "mondo-rstr-compare-EXT.h" 21 22 #include "mondo-rstr-tools-EXT.h" … … 2986 2987 make_hole_for_dir("/tmp/tmpfs"); /* just in case... */ 2987 2988 run_program_and_log_output("umount " MNT_CDROM, FALSE); 2988 run_program_and_log_output2989 2989 /* 2990 run_program_and_log_output("ln -sf /var/log/mondo-archive.log /tmp/mondo-restore.log", 2990 2991 FALSE); 2992 */ 2991 2993 2992 2994 run_program_and_log_output("rm -Rf /tmp/tmpfs/mondo.tmp.*", FALSE); … … 3343 3345 sprintf(tmp, "rm -Rf %s", bkpinfo->tmpdir); 3344 3346 run_program_and_log_output(tmp, FALSE); 3345 log_to_screen 3346 ("Restore log copied to /tmp/mondo-restore.log on your hard disk"); 3347 log_to_screen("Restore log (%s) copied to /var/log on your hard disk", MONDO_LOGFILE); 3347 3348 sprintf(tmp, 3348 3349 "Mondo-restore is exiting (retval=%d) ", -
branches/2.2.2/mondo/src/mondorestore/mondo-rstr-compare.c
r1294 r1315 162 162 } else { 163 163 sprintf(command_ptr, 164 "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors .txt",164 "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors", 165 165 MNT_RESTORING, bigfile_fname_ptr); 166 166 } 167 167 log_msg(2, command_ptr); 168 168 paranoid_system 169 ("cat /tmp/errors >> /tmp/mondo-restore.log 2> /dev/null");169 ("cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE); 170 170 if (system(command_ptr)) { 171 171 log_OS_error("Warning - command failed"); -
branches/2.2.2/mondo/src/mondorestore/mondo-rstr-tools.c
r1242 r1315 1727 1727 mvaddstr_and_log_it(g_currentY++, 74, "Failed."); 1728 1728 log_to_screen 1729 ("GRUB ran w/error(s). See /tmp/mondo-restore.log for more info.");1729 ("GRUB ran w/error(s). See %s for more info.", MONDO_LOGFILE); 1730 1730 log_msg(1, "Type:-"); 1731 1731 log_msg(1, " mount-me"); … … 2003 2003 mvaddstr_and_log_it(g_currentY++, 74, "Failed."); 2004 2004 log_to_screen 2005 ("MBR+fstab processed w/error(s). See /tmp/mondo-restore.log for more info.");2005 ("MBR+fstab processed w/error(s). See %s for more info.", MONDO_LOGFILE); 2006 2006 } else { 2007 2007 mvaddstr_and_log_it(g_currentY++, 74, "Done."); … … 2248 2248 2249 2249 if (run_program_and_log_output 2250 ("cp -f /tmp/mondo-restore.log " MNT_RESTORING "/tmp/", FALSE)) {2250 ("cp -f " MONDO_LOGFILE " " MNT_RESTORING "/var/log", FALSE)) { 2251 2251 log_msg(1, 2252 "Error. Failed to copy log to PC's /tmp dir. (Mounted read-only?)"); 2253 } 2254 if (run_program_and_log_output 2255 ("cp -f /tmp/mondo-restore.log " MNT_RESTORING "/root/", FALSE)) { 2256 log_msg(1, 2257 "Error. Failed to copy log to PC's /root dir. (Mounted read-only?)"); 2252 "Error. Failed to copy log to PC's /var/log dir. (Mounted read-only?)"); 2258 2253 } 2259 2254 if (does_file_exist("/tmp/DUMBASS-GENTOO")) { -
branches/2.2.2/mondo/src/restore-scripts/mondo/grub-MR
r567 r1315 1 1 #!/bin/sh 2 3 2 # 3 # $Id$ 4 # 4 5 # grub-MR ------ a rudimentary replacement for grub-install 5 6 # 6 7 # 7 #8 # 2005/11/259 # - try_grub_hack : do not return success when grub wrote 'Error '10 #11 # 2004/06/2812 # - added support for /dev/md0==GRUB13 #14 # 2004/06/2715 # - re-enable the call to grub-install and the 'echo' thing as a backup16 # - hacked the hack :) to improve MDK9.2 support17 # - added try_grub_hack()18 #19 # 2004/06/1420 # - just use grub-install.patched; nothing else21 #22 # 2004/05/0523 # - try EVERYTHING - grub-install, grub --batch, etc.24 #25 # 2004/04/1826 # - try grub --batch < /etc/grub.conf first27 # - if it fails, grub-install.patched instead28 # - if _that_ fails, fail.29 #30 # 2004/04/1531 # - added grub-install.patched to the mix32 #33 # 2004/04/0134 # - use grub-install if there's an NTFS partition on the disk35 #36 # 2004/03/3137 # - disabled direct call to grub38 #39 # 2004/03/2840 # - call grub directly if possible41 #42 # 2004/03/2643 # - find stage 1 if possible; more stable, reliable call to grub44 #45 # 2003/08/2446 # - fixed line 26 (Christian)47 #48 # 2002/11/1849 # - first incarnation50 51 52 LOGFILE=/var/log/mondo-archive.log53 54 8 55 9 Die() { -
branches/2.2.2/mondo/src/restore-scripts/mondo/hack-lilo
r567 r1315 1 1 #!/bin/sh 2 3 4 LogIt() { 5 echo "$1" >> /tmp/mondo-restore.log 6 } 7 2 # 3 # $Id$ 4 # 8 5 9 6 -
branches/2.2.2/mondo/src/restore-scripts/mondo/make-me-bootable
r911 r1315 1 1 #!/bin/sh 2 3 4 LOGFILE=/tmp/mondo-restore.log5 6 2 7 3 -
branches/2.2.2/mondo/src/restore-scripts/mondo/raw-MR
r567 r1315 7 7 LogIt "Restoring MBR..." 2 8 8 if uname -a | grep -q FreeBSD; then 9 echo -e 'y\ny' | /mnt/RESTORING/sbin/fdisk -b /BOOTLOADER.MBR -B $1 >/dev/null 2>> /tmp/mondo-restore.log9 echo -e 'y\ny' | /mnt/RESTORING/sbin/fdisk -b /BOOTLOADER.MBR -B $1 >/dev/null 2>> $LOGFILE 10 10 else 11 dd if=/BOOTLOADER.MBR of=$1 bs=446 count=1 2>> /tmp/mondo-restore.log11 dd if=/BOOTLOADER.MBR of=$1 bs=446 count=1 2>> $LOGFILE 12 12 fi 13 13 exit $? -
branches/2.2.2/mondo/src/restore-scripts/mondo/stabgrub-me
r1001 r1315 1 1 #!/bin/sh 2 2 # 3 # stabgrub-me 4 # 5 # 04/08/2003 6 # - cleaned up backup func a bit 7 # 8 # 9 # 10 # forked from stablilo-me on 2002/11/20 3 # $Id$ 11 4 # 12 5 ##################################################################### 13 6 14 15 LOGFILE=/tmp/mondo-restore.log16 7 17 8 QuitIfNotFound() { -
branches/2.2.2/mondo/src/restore-scripts/mondo/stabraw-me
r567 r1315 1 1 #!/bin/sh 2 2 # 3 # stabraw-me 4 # 5 # forked from stablilo-me on 2002/11/21 3 # $Id$ 6 4 # 7 5 ##################################################################### 8 6 9 10 LOGFILE=/tmp/mondo-restore.log11 7 12 8 QuitIfNotFound() { … … 16 12 fi 17 13 } 18 19 20 21 22 14 23 15 LocateOldFstab() {
Note:
See TracChangeset
for help on using the changeset viewer.