diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2013-04-06 19:50:17 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2013-04-06 19:50:17 +0200 |
| commit | 6caad191c1e0dfab3cbb7aa3e832a45eeaea83f8 (patch) | |
| tree | 560eec5bf839175248b76a4ca06ffb594972afcc | |
| parent | 092fe2ffde2075705b0a9c686246b3081aea963c (diff) | |
| download | devtools32-6caad191c1e0dfab3cbb7aa3e832a45eeaea83f8.tar.xz | |
Only try to use btrfs snapshots if chroots are on a btrfs partition
| -rw-r--r-- | archbuild.in | 4 | ||||
| -rw-r--r-- | mkarchroot.in | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/archbuild.in b/archbuild.in index 9f9633c..bdb18c0 100644 --- a/archbuild.in +++ b/archbuild.in @@ -58,7 +58,9 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then stat_done fi - { type -P btrfs && btrfs subvolume delete "${copy}"; } &>/dev/null + if [[ "$(stat -f -c %T "${copy}")" == btrfs ]]; then + { type -P btrfs && btrfs subvolume delete "${copy}"; } &>/dev/null + fi rm -rf --one-file-system "${copy}" done exec 9>&- diff --git a/mkarchroot.in b/mkarchroot.in index 9059cdb..ff9d7eb 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -160,8 +160,10 @@ else mkdir -p "${working_dir}" fi - if { type -P btrfs && btrfs subvolume create "${working_dir}"; } &>/dev/null; then - chmod 0755 "${working_dir}" + if [[ "$(stat -f -c %T "${working_dir}")" == btrfs ]]; then + if { type -P btrfs && btrfs subvolume create "${working_dir}"; } &>/dev/null; then + chmod 0755 "${working_dir}" + fi fi chroot_lock |