X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Frestore.in;h=5676cf90ea73268f32d229075aa610bdacb962a9;hb=3f6d87a61cf0bfd88c59526993683c5e65aa0d2f;hp=35c7f1366df7d02fc6f8c36a5afd6eebfb526b38;hpb=ef87ce7d109360c812ad5fef6d79591d2a37ac2d;p=chaz%2Ftar

diff --git a/scripts/restore.in b/scripts/restore.in
index 35c7f13..5676cf9 100644
--- a/scripts/restore.in
+++ b/scripts/restore.in
@@ -14,19 +14,21 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # Load library routines
 SYSCONFDIR=${SYSCONFDIR-@sysconfdir@}
-. ${LIBPATH-@libexecdir@}/backup.sh
+. ${LIBDIR-@libexecdir@}/backup.sh
 
 usage() {
     	cat - <<EOF
 usage: $PROGNAME [OPTIONS] [PATTERN [PATTERN...]]
 Options are:
 
-   -l, --level=LEVEL       Start restoring from backup level LEVEL (default $DUMP_LEVEL).
+   -a, --all               Restore all filesystems.
+   -l, --level=LEVEL       Start restoring from the given backup LEVEL
+                           (default $DUMP_LEVEL).
    -v, --verbose[=LEVEL]   Set verbosity level. Default 100.
 
 Informational options:   
@@ -53,6 +55,9 @@ do
       optarg=$opt
   fi
   case $option in
+  -a|--a|--al|--all)
+	 RESTORE_ALL=1
+	 ;;
   --l=*|--le=*|--lev=*|--leve=*|--level=*)
          DUMP_LEVEL=$optarg
 	 ;;
@@ -67,7 +72,7 @@ do
 	 ;;
   -v*)   VERBOSE=`expr $option : "-v\(.*\)"`;;
   -V|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    	 echo "restore; @PACKAGE@ (@VERSION@)"
+    	 echo "restore (@PACKAGE@ @VERSION@)"
 	 exit 0;;
   -L|--li|--lic|--lice|--licen|--licens|--license)
     	 license
@@ -85,6 +90,13 @@ do
   esac	
 done    
 
+if [ -z "$RESTORE_ALL" ]; then
+	if [ -z "$PATTERN" ]; then
+		usage
+		exit;
+	fi
+fi	
+
 init_restore
 cat > $LOGFILE <<EOF
 This file contains any messages produced by $PROGNAME.
@@ -99,6 +111,7 @@ EOF
 restore_fs()
 {
     fs="`echo \"${1}\" | sed -e 's/^.*://'`"
+    fs=`root_fs $fs`
     fsname="`echo \"${1}\" | sed -e 's/\//:/g'`"
     remotehost="`expr \"${1}\" : '\([^/][^/]*\):.*'`"
     if [ -z "$remotehost" ]; then
@@ -132,9 +145,9 @@ restore_fs()
       LABEL="`print_level $level` backup of ${fs} on ${remotehost} at ${DATE}"
       ${RESTORE_BEGIN-:} $level $remotehost $fs $fsname
       backup_host ${remotehost} \
-                  "--listed=`level_log_name $fs $level`" \
+                  "--listed=\"$FILE\"" \
                   "--label=\"$LABEL\"" \
-		  -C ${ROOT_FS-/}$fs
+		  -C $fs
       ${RESTORE_END-:} $level $remotehost $fs $fsname 		  
     done
 }
@@ -164,7 +177,7 @@ restore_files()
       LABEL="`print_level $level` backup of miscellaneous files at ${DATE}"
       ${RESTORE_BEGIN-:} $level $localhost MISC MISC
       backup_host ${localhost} \
-                  "--listed=`level_log_name MISC $level`" \
+                  "--listed=\"$FILE\"" \
                   "--label=\"$LABEL\"" \
 		  -C ${ROOT_FS-/} $@
       ${RESTORE_END-:} $level $localhost MISC MISC
@@ -221,4 +234,4 @@ fi) 2>&1 | tee -a "${LOGFILE}"
     
     
           
-	
\ No newline at end of file
+