Adding rc.restore_full_backup. Sync create backup with HEADRELENG_1_2

2 files changed, 16 insertions, 1 deletions

diff --git a/etc/rc.create_full_backup b/etc/rc.create_full_backup
index 143e652..048e68b 100755
--- a/etc/rc.create_full_backup
+++ b/etc/rc.create_full_backup
@@ -10,7 +10,9 @@ tar czPf /root/$FILENAME \
 	--exclude root/* \
 	--exclude var/empty/* \
 	--exclude var/empty \
+	--exclude var/etc \
 	/
+
 echo ">>> Backup completed.  Note: this backup includes config.xml!"
 echo ">>> To restore this backup run this command:"
-echo "    tar xzPUf /root/$FILENAME -C /"
+echo "    /etc/rc.restore_full_backup /root/$FILENAME"
diff --git a/etc/rc.restore_full_backup b/etc/rc.restore_full_backup
new file mode 100755
index 0000000..9e3d6ce
--- /dev/null
+++ b/etc/rc.restore_full_backup
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+echo -n "Checking..."
+if [ `tar tzPf $1 /etc/rc 2>/dev/null` ]; then
+	echo " Backup file looks OK."
+	echo "One moment, restoring ${1}..."
+	tar xzPfU $1 -C / 2>/var/etc/restore_log.txt
+	echo "Restore of $1 complete."
+else
+	echo " Error."
+	echo "File not found or invalid backup file. Available backups:"
+	ls -lah /root | grep backup | more
+fi