[arch-projects] [devtools] [PATCH 4/9] makechrootpkg: Use the btrfs mountpoint/subvolume check consistently.

Luke Shumaker LukeShu at sbcglobal.net
Sat May 10 22:22:06 EDT 2014


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 97c7780..c3edc72 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
-- 
1.9.2



More information about the arch-projects mailing list