diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-24 11:05:29 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-24 11:05:29 -0400 |
| commit | af743e1cbad18a1a7a6a6cdc0feef3b80e13db03 (patch) | |
| tree | f8534ed3c07ab34e7d875515cb237941c274f7a1 | |
| parent | 1736c182635da653babe2ec607a41294fdd5aacf (diff) | |
| parent | 0c62649b64b5da227593d951ae252bfc2cd894a4 (diff) | |
| download | devtools32-af743e1cbad18a1a7a6a6cdc0feef3b80e13db03.tar.xz | |
Merge commit '0c6264' into complete
| -rw-r--r-- | makechrootpkg.in | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in index b8de509..63ea388 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -77,6 +77,9 @@ done # Canonicalize chrootdir, getting rid of trailing / chrootdir=$(readlink -e "$passeddir") +# Detect chrootdir filesystem type +chroottype=$(stat -f -c %T "$chrootdir") + if [[ ${copy:0:1} = / ]]; then copydir=$copy else @@ -123,16 +126,14 @@ if [[ ! -d $copydir ]] || $clean_first; then lock_open_read 8 "$chrootdir/root" "Locking clean chroot" stat_busy "Creating clean working copy [$copy]" - use_rsync=false - if type -P btrfs >/dev/null; then - [[ -d $copydir ]] && btrfs subvolume delete "$copydir" &>/dev/null - btrfs subvolume snapshot "$chrootdir/root" "$copydir" &>/dev/null || - use_rsync=true + if [[ "$chroottype" == btrfs ]]; then + if [[ -d $copydir ]]; then + btrfs subvolume delete "$copydir" >/dev/null || + die "Unable to delete subvolume $copydir" + fi + btrfs subvolume snapshot "$chrootdir/root" "$copydir" >/dev/null || + die "Unable to create subvolume $copydir" else - use_rsync=true - fi - - if $use_rsync; then mkdir -p "$copydir" rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir" fi |