summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-01-05 18:53:16 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-01-05 18:53:16 -0500
commit257a3fbfc839be9d056b38b6a1110a1550253d79 (patch)
tree44c4a0970e9c84846756a7507330e3a90e363734
parentfa6e7ccf3914081504681679645fd7cfd803cfdd (diff)
chroot-tools: make patch not reject new bugfix in devtools-par
-rw-r--r--src/chroot-tools/makechrootpkg.sh.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/chroot-tools/makechrootpkg.sh.patch b/src/chroot-tools/makechrootpkg.sh.patch
index 672da83..d6c96f9 100644
--- a/src/chroot-tools/makechrootpkg.sh.patch
+++ b/src/chroot-tools/makechrootpkg.sh.patch
@@ -1,5 +1,5 @@
---- makechrootpkg.sh.in 2014-01-05 00:02:08.650446097 -0500
-+++ makechrootpkg.sh.ugly 2014-01-05 00:20:01.914448010 -0500
+--- makechrootpkg.sh.in 2014-01-05 18:51:41.463720929 -0500
++++ makechrootpkg.sh.ugly 2014-01-05 18:52:41.624501065 -0500
@@ -12,6 +12,7 @@
shopt -s nullglob
@@ -110,7 +110,7 @@
+ local chroottype=$(stat -f -c %T "$copydir")
+
+ stat_busy "Removing chroot copy [%s]" "$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"
@@ -178,9 +201,14 @@