jarno
/
snapsh
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Unmount and delete toplevel mountpoint after operations

This commit is contained in:
Jarno Rankinen 2021-10-27 22:12:09 +03:00
parent d502f26ed8
commit 338a39ca1a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
snapsh
View File

@ -28,6 +28,12 @@ else
TIMESTAMP="$(date +%Y.%m.%d-%H.%M.%S)" # Timestamp used in naming snapshots TIMESTAMP="$(date +%Y.%m.%d-%H.%M.%S)" # Timestamp used in naming snapshots
fi # (Not the one used in --list) fi # (Not the one used in --list)
exit() {
umount ${TOPLEVEL}
rmdir ${TOPLEVEL}
builtin exit $1
}
## In case of problems, define the path to the 'btrfs' executable here ## In case of problems, define the path to the 'btrfs' executable here
BTRFS_EXECUTABLE=$(which btrfs) BTRFS_EXECUTABLE=$(which btrfs)
@ -67,7 +73,6 @@ mount_check() {
[[ -d ${TOPLEVEL} ]] || mkdir -p ${TOPLEVEL} [[ -d ${TOPLEVEL} ]] || mkdir -p ${TOPLEVEL}
# Mount the toplevel # Mount the toplevel
mount -U ${MOUNT_UUID} -o subvolid=5 ${TOPLEVEL} mount -U ${MOUNT_UUID} -o subvolid=5 ${TOPLEVEL}
printf "Created mountpoint ${TOPLEVEL} for the top level subvolume.\n"
fi fi
# Check that the subvolume for storing snapshots exists, and if not, # Check that the subvolume for storing snapshots exists, and if not,
@ -144,7 +149,7 @@ list() {
NUM=1 NUM=1
SNAPSHOTS=(${SNAPSHOTS_LOCATION}/*/) SNAPSHOTS=(${SNAPSHOTS_LOCATION}/*/)
if [[ "${#SNAPSHOTS[@]}" -eq 0 ]]; then if [[ "${#SNAPSHOTS[@]}" -eq 0 ]]; then
printf "No snapshots found in ${SNAPSHOTS_LOCATION}.\n" printf "No snapshots managed by snapsh found.\n"
exit 0 exit 0
fi fi
printf "%6s %s %s %26s %10s %s %6s %s %s\n" "Number" "|" "Time:" "|" \ printf "%6s %s %s %26s %10s %s %6s %s %s\n" "Number" "|" "Time:" "|" \
@ -254,6 +259,7 @@ rollback() {
printf "Copying ${TARGET} to ${TOPLEVEL}/${SOURCE_SUBVOLUME}...\n" printf "Copying ${TARGET} to ${TOPLEVEL}/${SOURCE_SUBVOLUME}...\n"
${BTRFS_EXECUTABLE} subvolume snapshot ${TARGET} ${TOPLEVEL}/${SOURCE_SUBVOLUME} ${BTRFS_EXECUTABLE} subvolume snapshot ${TARGET} ${TOPLEVEL}/${SOURCE_SUBVOLUME}
rm -f ${TOPLEVEL}/${SOURCE_SUBVOLUME}/.snapsh
# Check for SElinux # Check for SElinux
if [[ $(/usr/sbin/getenforce) == "Enforcing" ]]; then if [[ $(/usr/sbin/getenforce) == "Enforcing" ]]; then
@ -297,6 +303,7 @@ post-rollback() {
shopt -s nullglob shopt -s nullglob
echo "Checking for leftover subvolumes..." | systemd-cat -t snapsh echo "Checking for leftover subvolumes..." | systemd-cat -t snapsh
mount_check
BACKUPS=(${TOPLEVEL}/*.backup/) BACKUPS=(${TOPLEVEL}/*.backup/)