Skip to content
Snippets Groups Projects
Commit 12a13006 authored by Luke Shumaker's avatar Luke Shumaker Committed by Dave Reisner
Browse files

makechrootpkg: Use the btrfs mountpoint/subvolume check consistently.

Commit 59e348fc added a btrfs subvolume
check, but only used it in create_chroot(); it missed clean_temporary().
parent 625e6bd4
No related merge requests found
...@@ -164,7 +164,7 @@ create_chroot() { ...@@ -164,7 +164,7 @@ create_chroot() {
clean_temporary() { clean_temporary() {
stat_busy "Removing temporary copy [$copy]" stat_busy "Removing temporary copy [$copy]"
if [[ "$chroottype" == btrfs ]]; then if [[ "$chroottype" == btrfs ]] && ! mountpoint -q "$copydir"; then
btrfs subvolume delete "$copydir" >/dev/null || btrfs subvolume delete "$copydir" >/dev/null ||
die "Unable to delete subvolume %s" "$copydir" die "Unable to delete subvolume %s" "$copydir"
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment