X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=gnt-lv-snap-rsync.sh;h=b2025d8a9b6776a7920224e6d198da95aff97f60;hb=fa3ab9a4fe7ce013a8c5d68e674069ac7edbbcd9;hp=85722baec8215fc4bba78d4f7ada1c79a115568d;hpb=5f2d4aef38d5938c180eb760cd9943a579930088;p=gnt-info

diff --git a/gnt-lv-snap-rsync.sh b/gnt-lv-snap-rsync.sh
index 85722ba..b2025d8 100755
--- a/gnt-lv-snap-rsync.sh
+++ b/gnt-lv-snap-rsync.sh
@@ -3,12 +3,16 @@
 instance=$1
 disk=$2
 
-if [ -z "$instance" -o -z "$disk" ] ; then
+if [ "$1" = '-' ] ; then
+	read instance disk
+elif [ -z "$instance" -o -z "$disk" ] ; then
 	echo "Usage: $0 instance disk"
 	exit 1
 fi
 
-instance=`gnt-instance list --no-headers -o name $instance`
+test -z "$instance" && exit 1
+
+instance=`gnt-instance list --no-headers -o name $instance | head -1`
 
 node=`gnt-instance list -o pnode --no-headers $instance`
 echo "# $instance on $node"
@@ -17,17 +21,25 @@ ssh $node lvs -o name,tags | grep $instance | tee /dev/shm/$instace.$node.lvs |
 	disk_nr=`echo $lv | cut -d. -f2 | tr -d a-z_`
 	echo "# $lv | $origin | $disk_nr"
 
-cat <<__SHELL__ | tee /dev/shm/$instance.sh
+cat <<__SHELL__ > /dev/shm/$instance.sh
+
 	lvcreate -L20480m -s -n$lv.snap /dev/ffzgvg/$lv
+
 	mkdir /dev/shm/$lv.snap
+
 	# we must mount filesystem read-write to allow journal recovery
-	mount /dev/ffzgvg/$lv.snap /dev/shm/$lv.snap -o noatime \
-	|| offset=`fdisk -l /dev/ffzgvg/$lv.snap -u | grep Linux$ | grep /dev/ffzgvg/$lv.snap | head -1 | awk '{ print $2 * 512 }'` \
-	&& mount /dev/ffzgvg/$lv.snap /dev/shm/$lv.snap -o noatime,offset=$offset \
+	offset=\`fdisk -l /dev/ffzgvg/$lv.snap -u | grep Linux$ | grep /dev/ffzgvg/$lv.snap | head -1 | sed 's/\*/ /' | awk '{ print \$2 * 512 }'\`
+	test ! -z "\$offset" && offset=",offset=\$offset"
+	mount /dev/ffzgvg/$lv.snap /dev/shm/$lv.snap -o noatime\$offset
+
+	rsync -ravHz --inplace --numeric-ids --delete /dev/shm/$lv.snap/ lib15::backup/$instance/$disk_nr/
 
-	rsync -ravHz --numeric-ids --sparse --delete /dev/shm/$lv.snap/ lib15::backup/$instance/$disk_nr/
 	umount /dev/shm/$lv.snap
+
 	lvremove -f /dev/ffzgvg/$lv.snap
+
+	rmdir /dev/shm/$lv.snap
+	rm -v /dev/shm/$instance.sh
 __SHELL__
 
 	scp /dev/shm/$instance.sh $node:/dev/shm/$instance.sh