Changeset 1315 in MondoRescue for branches/2.2.2/mondo/src/restore-scripts

Timestamp:

Apr 16, 2007, 4:13:59 PM (18 years ago)

Author:

Bruno Cornec

Message:

Log files are now consistent: mondoarchive.log for mondoarchive (containing also mindi.log) and mondorestore.log for mondorestore (copied from /tmp (ram) to /var/log (disk) at the end of the restore)
One include has been created for each bianry containing only that declaration ofr the moment, but which will be extended to include all local definitions (ps_* e.g.)
Doc updated accordingly
LOGFILE in restore process is now passed in the environment and not duplicated anymore
LogIt is not redifined either
LOGFILE should be put in environment by mondoarchive for mindi's usage but that's a step left for later.

Location:

branches/2.2.2/mondo/src/restore-scripts/mondo

Files:

• grub-MR (modified) (1 diff)
• hack-lilo (modified) (1 diff)
• make-me-bootable (modified) (1 diff)
• raw-MR (modified) (1 diff)
• stabgrub-me (modified) (1 diff)
• stabraw-me (modified) (2 diffs)

branches/2.2.2/mondo/src/restore-scripts/mondo/grub-MR

@@ -1 +1 @@
 #!/bin/sh
-
-
+#
+# $Id$
+#
 # grub-MR ------ a rudimentary replacement for grub-install
 #
 #
-#
-# 2005/11/25
-# - try_grub_hack : do not return success when grub wrote 'Error '
-#
-# 2004/06/28
-# - added support for /dev/md0==GRUB
-#
-# 2004/06/27
-# - re-enable the call to grub-install and the 'echo' thing as a backup
-# - hacked the hack :) to improve MDK9.2 support
-# - added try_grub_hack()
-#
-# 2004/06/14
-# - just use grub-install.patched; nothing else
-#
-# 2004/05/05
-# - try EVERYTHING - grub-install, grub --batch, etc.
-#
-# 2004/04/18
-# - try grub --batch < /etc/grub.conf first
-# - if it fails, grub-install.patched instead
-# - if _that_ fails, fail.
-#
-# 2004/04/15
-# - added grub-install.patched to the mix
-#
-# 2004/04/01
-# - use grub-install if there's an NTFS partition on the disk
-#
-# 2004/03/31
-# - disabled direct call to grub
-#
-# 2004/03/28
-# - call grub directly if possible
-#
-# 2004/03/26
-# - find stage 1 if possible; more stable, reliable call to grub
-#
-# 2003/08/24
-# - fixed line 26 (Christian)
-#
-# 2002/11/18
-# - first incarnation
-
-
-LOGFILE=/var/log/mondo-archive.log
-
 
 Die() {

branches/2.2.2/mondo/src/restore-scripts/mondo/hack-lilo

@@ -1 +1 @@
 #!/bin/sh
-
-
-LogIt() {
-    echo "$1" >> /tmp/mondo-restore.log
-}
-
+#
+# $Id$
+#
 
 

branches/2.2.2/mondo/src/restore-scripts/mondo/make-me-bootable

@@ -1 +1 @@
 #!/bin/sh
-
-
-LOGFILE=/tmp/mondo-restore.log
-
 
 

branches/2.2.2/mondo/src/restore-scripts/mondo/raw-MR

@@ -7 +7 @@
 LogIt "Restoring MBR..." 2
 if uname -a | grep -q FreeBSD; then
-    echo -e 'y\ny' | /mnt/RESTORING/sbin/fdisk -b /BOOTLOADER.MBR -B $1 >/dev/null 2>>/tmp/mondo-restore.log
+    echo -e 'y\ny' | /mnt/RESTORING/sbin/fdisk -b /BOOTLOADER.MBR -B $1 >/dev/null 2>> $LOGFILE
 else
-    dd if=/BOOTLOADER.MBR of=$1 bs=446 count=1 2>> /tmp/mondo-restore.log
+    dd if=/BOOTLOADER.MBR of=$1 bs=446 count=1 2>> $LOGFILE
 fi
 exit $?

branches/2.2.2/mondo/src/restore-scripts/mondo/stabgrub-me

@@ -1 +1 @@
 #!/bin/sh
 #
-# stabgrub-me
-#
-# 04/08/2003
-# - cleaned up backup func a bit
-#
-#
-#
-# forked from stablilo-me on 2002/11/20
+# $Id$
 #
 #####################################################################
 
-
-LOGFILE=/tmp/mondo-restore.log
 
 QuitIfNotFound() {

branches/2.2.2/mondo/src/restore-scripts/mondo/stabraw-me

@@ -1 +1 @@
 #!/bin/sh
 #
-# stabraw-me
-#
-# forked from stablilo-me on 2002/11/21
+# $Id$
 #
 #####################################################################
 
-
-LOGFILE=/tmp/mondo-restore.log
 
 QuitIfNotFound() {
@@ -16 +12 @@
     fi
 }
-
-
-
-
 
 LocateOldFstab() {