* backup-snaprsync: pass $vardir as argument to snap-drop

[chiark-utils.git] / backup / snaprsync

diff --git a/backup/snaprsync b/backup/snaprsync
index 814514085f059f689afc44976ad86c9e550e7b52..82ea5d416f8ab1dc86349b2c7287a7a3dd886626 100755 (executable)
--- a/backup/snaprsync
+++ b/backup/snaprsync
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # usage: snaprsync <setting>... <positionals>
 #!/bin/bash
 #
 # usage: snaprsync <setting>... <positionals>

-#  <setting> is ---<name>=<value>
+#  <setting> is --<name>=<value>

 #  <positionals> are assigned to unused mandatory values in order
 # mandatory:
 #   rhost device mountpoint localarea 
 #  <positionals> are assigned to unused mandatory values in order
 # mandatory:
 #   rhost device mountpoint localarea 


@@ -12,22 +12,54 @@
        retcdir=/etc/chiark-backup
        rvardir=/var/lib/chiark-backup
        bwlimit=
        retcdir=/etc/chiark-backup
        rvardir=/var/lib/chiark-backup
        bwlimit=

+       subdir=.
+       rsyncopts=
+       rsynccompress=z
+       sshopts=
+       summer=summer
+
+
+# snaprsync
+#
+# This file is part of chiark backup, a system for backing up GNU/Linux and
+# other UN*X-compatible machines, as used on chiark.greenend.org.uk.
+#
+# chiark backup is:
+#  Copyright (C) 1997-1998,2000-2001,2007
+#                     Ian Jackson <ian@chiark.greenend.org.uk>
+#  Copyright (C) 1999 Peter Maydell <pmaydell@chiark.greenend.org.uk>
+#
+# This is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 3, or (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
+

 
 set -e
 
 badusage () { echo >&2 "snaprsync: bad usage: $1"; exit 12; }
 
 set -e
 
 badusage () { echo >&2 "snaprsync: bad usage: $1"; exit 12; }

-x () { echo "+ $@"; "$@"; }
-xspawned () { eval "${1}pid=$!; echo \"+[$!] ($1) &\";"; }
-xwait () { eval "echo \"+[\$${1}pid] ($1)...\"; wait \$${1}pid;"; }
+nb_echo () { (echo "$@"); } # See Debian #382798
+x () { nb_echo "+ $@"; "$@"; }
+xspawned () { eval "${1}pid=$!; nb_echo \"+[$!] ($1) &\";"; }
+xwait () { eval "nb_echo \"+[\$${1}pid] ($1)...\"; wait \$${1}pid;"; }

 
 while true; do
        case "$1" in
 
 while true; do
        case "$1" in

-       --?*=?*)
+       --?*=*)

                name=${1#--}; name=${name%%=*}
                value=${1#--*=}
                case "$name" in
                rhost|device|mountpoint|localarea);;
                name=${1#--}; name=${name%%=*}
                value=${1#--*=}
                case "$name" in
                rhost|device|mountpoint|localarea);;

-               localprevious|rsharedir|retcdir|rvardir|bwlimit);;
+               localprevious|snapkind|rsharedir|retcdir|rvardir|bwlimit);;
+               subdir|rsyncopts|rsynccompress|sshopts|summer);;

                *) badusage "unknown setting $name";;
                esac
                eval "$name=\$value"
                *) badusage "unknown setting $name";;
                esac
                eval "$name=\$value"


@@ -49,18 +81,18 @@ done
 
 datefmt='%Y-%m-%d %H:%M:%S Z'
 rsync="rsync ${bwlimit:+--bwlimit} $bwlimit"
 
 datefmt='%Y-%m-%d %H:%M:%S Z'
 rsync="rsync ${bwlimit:+--bwlimit} $bwlimit"

-export RSYNC_RSH='ssh -o compression=no'
+export RSYNC_RSH="ssh -o compression=no $sshopts"

 sshpfx='PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin; export PATH; '
 
 sshpfx='PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin; export PATH; '
 

-ssh $rhost "$sshpfx date -u '+$rhost $datefmt start'"
-ssh $rhost "$sshpfx id"
-ssh $rhost "$sshpfx ls -d $rsharedir"
-ssh $rhost "$sshpfx ls -d $rvardir"
+ssh $sshopts $rhost "$sshpfx date -u '+$rhost $datefmt start'"
+ssh $sshopts $rhost "$sshpfx id"
+ssh $sshopts $rhost "$sshpfx ls -d $rsharedir"
+ssh $sshopts $rhost "$sshpfx ls -d $rvardir"

 
 test -d $localarea || x mkdir $localarea
 ournode=`uname -n`
 rsumsfile=for-$ournode.sums
 
 test -d $localarea || x mkdir $localarea
 ournode=`uname -n`
 rsumsfile=for-$ournode.sums

-summer='summer -ACDbtqf'
+summer="$summer -ACDBtqfx"

 
 td=/dev/enoent
 rc=12
 
 td=/dev/enoent
 rc=12


@@ -70,9 +102,16 @@ td=`mktemp -td`
 mkfifo -m 600 $td/sentinel
 exec 4<>$td/sentinel
 
 mkfifo -m 600 $td/sentinel
 exec 4<>$td/sentinel
 

-x ssh $rhost "$sshpfx $rsharedir/snap-drop"
-x ssh $rhost "$sshpfx $retcdir/snap/$snapkind snap $rvardir $device $mountpoint"
-ssh $rhost <$td/sentinel 4<&- "
+x ssh $sshopts $rhost "$sshpfx $rsharedir/snap-drop $rvardir"
+x ssh $sshopts $rhost "
+       $sshpfx
+       set -e
+       cd $rvardir
+       echo '$retcdir/snap/$snapkind drop $rvardir' >snap-drop.new
+       mv snap-drop.new snap-drop
+"
+x ssh $sshopts $rhost "$sshpfx $retcdir/snap/$snapkind snap $rvardir $device $mountpoint"
+ssh $sshopts $rhost <$td/sentinel 4<&- "

   $sshpfx
   set -e
   date -u '+$rhost $datefmt main'
   $sshpfx
   set -e
   date -u '+$rhost $datefmt main'


@@ -82,33 +121,31 @@ ssh $rhost <$td/sentinel 4<&- "
   umask 077
   exec 3>$rsumsfile
   cd snap-mount
   umask 077
   exec 3>$rsumsfile
   cd snap-mount

-  $summer . | sort -t' ' -k2 >&3
-  test x\"\${PIPESTATUS[*]}\" = 'x0 0'
+  $summer . >&3

   date -u '+$rhost $datefmt sumsdone'
   cd ..
 " &
 xspawned rsum
   date -u '+$rhost $datefmt sumsdone'
   cd ..
 " &
 xspawned rsum

-x $rsync -aHSxz --numeric-ids --delete \
+x $rsync -aHSx$rsynccompress --numeric-ids --delete $rsyncopts \

        ${localprevious:+--link-dest} $localprevious \
        ${localprevious:+--link-dest} $localprevious \

-       $rhost:$rvardir/snap-mount/. $localarea/.
+       $rhost:$rvardir/snap-mount/$subdir $localarea/.

 date -u "+ $datefmt rsyncdone"
 
 exec 3>$localarea,lsums
 (cd $localarea && \
 date -u "+ $datefmt rsyncdone"
 
 exec 3>$localarea,lsums
 (cd $localarea && \

- $summer . | sort -t'  ' -k2 >&3 && \
- test x"${PIPESTATUS[*]}" = 'x0 0') &
+ $summer . >&3) &

 xspawned lsum
 exec 3>&-
 
 xwait rsum
 exec 4<&-
 date -u "+ $datefmt sumsdone"
 xspawned lsum
 exec 3>&-
 
 xwait rsum
 exec 4<&-
 date -u "+ $datefmt sumsdone"

-x ssh $rhost "$sshpfx $rsharedir/snap-drop"
+x ssh $sshopts $rhost "$sshpfx $rsharedir/snap-drop $rvardir"

 
 

-if [ "x${localprevious}" != x ]; then
+if [ "x${localprevious}" != x ] && test -f "$localprevious,rsums"; then

        cp "$localprevious,rsums" "$localarea,rsums"
 fi
        cp "$localprevious,rsums" "$localarea,rsums"
 fi

-x $rsync -p \
+x $rsync -pI \

        $rhost:$rvardir/$rsumsfile \
        "$localarea,rsums"
 
        $rhost:$rvardir/$rsumsfile \
        "$localarea,rsums"
 


@@ -116,7 +153,8 @@ xwait $lsum
 date -u "+ $datefmt checking"
 
 set +e
 date -u "+ $datefmt checking"
 
 set +e

-x diff -u "$localarea,rsums" "$localarea,lsums" >"$localarea,sumsdiff"
+diff -u <(sed -e 's/^mountpoint/dir       /' "$localarea,rsums") \
+  "$localarea,lsums" >"$localarea,sumsdiff"

 diffrc=$?
 set -e
 test $diffrc = 0 || test $diffrc = 1
 diffrc=$?
 set -e
 test $diffrc = 0 || test $diffrc = 1