From: Alexander Barton <alex@barton.de>
Date: Sat, 4 Jan 2014 00:43:44 +0000 (+0100)
Subject: btrfs-mksnapshot: Only use first component of volume
X-Git-Url: https://arthur.barton.de/gitweb/?p=ax-linux.git;a=commitdiff_plain;h=17645219a2a79a4af90d23c2a44aa5fd29e615bf

btrfs-mksnapshot: Only use first component of volume

Only use the first component of a volume name that contains dashes ("-").
---

diff --git a/btrfs/mksnapshot/btrfs-mksnapshot b/btrfs/mksnapshot/btrfs-mksnapshot
index 4528981..a3fb8ad 100755
--- a/btrfs/mksnapshot/btrfs-mksnapshot
+++ b/btrfs/mksnapshot/btrfs-mksnapshot
@@ -91,8 +91,6 @@ fi
 
 [ -z "$DRY_RUN" ] || echo "FS_MOUNT_PATH=$FS_MOUNT_PATH"
 
-[ -z "$DRY_RUN" ] || exit 0
-
 # Generate snapshot name
 i=1
 date=`date +%Y%m%d`
@@ -105,10 +103,15 @@ while true; do
 	fi
 	i=`expr $i + 1`
 done
+NEW_VOLUME_NAME="`echo $VOLUME_NAME | cut -d'-' -f1`-$id"
+
+[ -z "$DRY_RUN" ] || echo "NEW_VOLUME_NAME=$NEW_VOLUME_NAME"
+
+[ -z "$DRY_RUN" ] || exit 0
 
 echo "Creating snapshot of \"$VOLUME_PATH\" (\"$VOLUME_NAME\") in btrfs \"$FS_NAME\" ..."
 set -x
 
 cd "$FS_MOUNT_PATH"
-btrfs subvolume snapshot "$VOLUME_NAME" "$VOLUME_NAME-$id"
+btrfs subvolume snapshot "$VOLUME_NAME" "$NEW_VOLUME_NAME"
 find . -maxdepth 1 -name "$VOLUME_NAME"'*' -exec ls -1d {} \; | column