You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
37 lines
1.7 KiB
37 lines
1.7 KiB
diff -up util-linux-2.23.2/tests/functions.sh.kzak util-linux-2.23.2/tests/functions.sh |
|
--- util-linux-2.23.2/tests/functions.sh.kzak 2013-06-13 09:46:10.554651768 +0200 |
|
+++ util-linux-2.23.2/tests/functions.sh 2013-09-09 10:01:23.355469268 +0200 |
|
@@ -483,7 +483,7 @@ function ts_scsi_debug_init { |
|
modprobe scsi_debug $* |
|
[ "$?" == 0 ] || ts_die "Cannot init device" |
|
|
|
- DEVNAME=$(grep scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}') |
|
+ DEVNAME=$(grep --with-filename scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}') |
|
[ "x${DEVNAME}" == "x" ] && ts_die "Cannot find device" |
|
|
|
DEVICE="/dev/${DEVNAME}" |
|
diff -up util-linux-2.23.2/tests/ts/cramfs/mkfs.kzak util-linux-2.23.2/tests/ts/cramfs/mkfs |
|
--- util-linux-2.23.2/tests/ts/cramfs/mkfs.kzak 2013-06-13 09:46:10.557651793 +0200 |
|
+++ util-linux-2.23.2/tests/ts/cramfs/mkfs 2013-09-09 10:01:23.355469268 +0200 |
|
@@ -80,7 +80,7 @@ cd $TS_MOUNTPOINT |
|
|
|
ts_log "list the image" |
|
export TZ='GMT-1' |
|
-ls -laR --time-style=long-iso . >> $TS_OUTPUT |
|
+ls -laR --time-style=long-iso . | sed 's:\. : :g' >> $TS_OUTPUT |
|
echo >> $TS_OUTPUT |
|
|
|
ts_log "list checksums from new data" |
|
diff -up util-linux-2.23.2/tests/ts/libmount/context-utab.kzak util-linux-2.23.2/tests/ts/libmount/context-utab |
|
--- util-linux-2.23.2/tests/ts/libmount/context-utab.kzak 2013-06-13 09:46:10.561651827 +0200 |
|
+++ util-linux-2.23.2/tests/ts/libmount/context-utab 2013-09-09 10:01:23.355469268 +0200 |
|
@@ -85,7 +85,9 @@ grep -q $DEVICE $LIBMOUNT_UTAB && \ |
|
echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 |
|
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 |
|
udevadm settle
|
|
|