Commit 0c62649b authored by Seblu's avatar Seblu Committed by Pierre Schmitz
Browse files

makechrootpkg: Properly detect filesystem type 



Enable btrfs features only if the underlying filesystem is btrfs and not rely
on the presence of the btrfs tools.

Signed-off-by: default avatarSébastien Luttringer <seblu@seblu.net>
Signed-off-by: default avatarPierre Schmitz <pierre@archlinux.de>
parent b807c511

makechrootpkg.in

+10 −9
Original line number Diff line number Diff line
@@ -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
@@ -134,16 +137,14 @@ if [[ ! -d $copydir ]] || $clean_first; then 
	fi



	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

	else

		use_rsync=true

	if [[ "$chroottype" == btrfs ]]; then

		if [[ -d $copydir ]]; then

			btrfs subvolume delete "$copydir" >/dev/null ||

				die "Unable to delete subvolume $copydir"

		fi



	if $use_rsync; then

		btrfs subvolume snapshot "$chrootdir/root" "$copydir" >/dev/null ||

			die "Unable to create subvolume $copydir"

	else

		mkdir -p "$copydir"

		rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir"

	fi