From 12a1300694272928e70408f4ce2fe85bacd19eb4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 10 May 2014 22:22:06 -0400
Subject: [PATCH] makechrootpkg: Use the btrfs mountpoint/subvolume check
consistently.
Commit 59e348fc3c5dd086331d884a6dd76fb43a92b7eb added a btrfs subvolume
check, but only used it in create_chroot(); it missed clean_temporary().
---
makechrootpkg.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 5ed7390..8bc18a4 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -164,7 +164,7 @@ create_chroot() {
clean_temporary() {
stat_busy "Removing temporary copy [$copy]"
- if [[ "$chroottype" == btrfs ]]; then
+ if [[ "$chroottype" == btrfs ]] && ! mountpoint -q "$copydir"; then
btrfs subvolume delete "$copydir" >/dev/null ||
die "Unable to delete subvolume %s" "$copydir"
else
--
GitLab