summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-05-10 22:22:06 -0400
committerDave Reisner <dreisner@archlinux.org>2014-09-22 08:25:43 -0400
commit12a1300694272928e70408f4ce2fe85bacd19eb4 (patch)
tree0fa9b6a25307cb1e37bf618fa0d757a9143e3753
parent625e6bd41206c5018b1a9e11c5cc2b3aef55a66e (diff)
downloaddevtools-12a1300694272928e70408f4ce2fe85bacd19eb4.tar.xz
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().
-rw-r--r--makechrootpkg.in2
1 files changed, 1 insertions, 1 deletions
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