From: Karel Zak <kzak@redhat.com>
Date: Tue, 8 Oct 2013 15:00:44 +0000 (+0200)
Subject: tests: use 'btrfs' rather than 'btrfsctl'
X-Git-Tag: v2.24-rc2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d414f5d4215c462ceb1d010c61a98c54a65186d1;p=thirdparty%2Futil-linux.git

tests: use 'btrfs' rather than 'btrfsctl'

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab
index 859fc2bca1..b3aaff99ff 100755
--- a/tests/ts/libmount/context-utab
+++ b/tests/ts/libmount/context-utab
@@ -89,11 +89,11 @@ ts_finalize_subtest
 if [ -x "/sbin/mkfs.btrfs" ]; then
 	$TS_CMD_WIPEFS -a  $DEVICE &> /dev/null
 	ts_log "Create filesystem [btrfs]"
-	/sbin/mkfs.btrfs -L "$LABEL" $DEVICE &> /dev/null
+	mkfs.btrfs -L "$LABEL" $DEVICE &> /dev/null
 	udevadm settle
 
 	mount -t btrfs $DEVICE $MOUNTPOINT &> /dev/null
-	/sbin/btrfsctl -S sub $MOUNTPOINT &> /dev/null
+	btrfs subvolume create $MOUNTPOINT/sub &> /dev/null
 	umount $MOUNTPOINT &> /dev/null
 
 	udevadm settle
diff --git a/tests/ts/libmount/context-utab-py b/tests/ts/libmount/context-utab-py
index 024bd92d45..ed379d4a61 100755
--- a/tests/ts/libmount/context-utab-py
+++ b/tests/ts/libmount/context-utab-py
@@ -87,11 +87,11 @@ ts_finalize_subtest
 if [ -x "/sbin/mkfs.btrfs" ]; then
 	$TS_CMD_WIPEFS -a  $DEVICE &> /dev/null
 	ts_log "Create filesystem [btrfs]"
-	/sbin/mkfs.btrfs -L "$LABEL" $DEVICE &> /dev/null
+	mkfs.btrfs -L "$LABEL" $DEVICE &> /dev/null
 	udevadm settle
 
 	mount -t btrfs $DEVICE $MOUNTPOINT &> /dev/null
-	/sbin/btrfsctl -S sub $MOUNTPOINT &> /dev/null
+	btrfs subvolume create $MOUNTPOINT/sub &> /dev/null
 	umount $MOUNTPOINT &> /dev/null
 
 	udevadm settle