|
 |
531551 |
diff -up util-linux-2.23.2/tests/functions.sh.kzak util-linux-2.23.2/tests/functions.sh
|
|
|
531551 |
--- util-linux-2.23.2/tests/functions.sh.kzak 2013-06-13 09:46:10.554651768 +0200
|
|
|
531551 |
+++ util-linux-2.23.2/tests/functions.sh 2013-09-09 10:01:23.355469268 +0200
|
|
|
531551 |
@@ -483,7 +483,7 @@ function ts_scsi_debug_init {
|
|
|
531551 |
modprobe scsi_debug $*
|
|
|
531551 |
[ "$?" == 0 ] || ts_die "Cannot init device"
|
|
|
531551 |
|
|
|
531551 |
- DEVNAME=$(grep scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}')
|
|
|
531551 |
+ DEVNAME=$(grep --with-filename scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}')
|
|
|
531551 |
[ "x${DEVNAME}" == "x" ] && ts_die "Cannot find device"
|
|
|
531551 |
|
|
|
531551 |
DEVICE="/dev/${DEVNAME}"
|
|
|
531551 |
diff -up util-linux-2.23.2/tests/ts/cramfs/mkfs.kzak util-linux-2.23.2/tests/ts/cramfs/mkfs
|
|
|
531551 |
--- util-linux-2.23.2/tests/ts/cramfs/mkfs.kzak 2013-06-13 09:46:10.557651793 +0200
|
|
|
531551 |
+++ util-linux-2.23.2/tests/ts/cramfs/mkfs 2013-09-09 10:01:23.355469268 +0200
|
|
|
531551 |
@@ -80,7 +80,7 @@ cd $TS_MOUNTPOINT
|
|
|
531551 |
|
|
|
531551 |
ts_log "list the image"
|
|
|
531551 |
export TZ='GMT-1'
|
|
|
531551 |
-ls -laR --time-style=long-iso . >> $TS_OUTPUT
|
|
|
531551 |
+ls -laR --time-style=long-iso . | sed 's:\. : :g' >> $TS_OUTPUT
|
|
|
531551 |
echo >> $TS_OUTPUT
|
|
|
531551 |
|
|
|
531551 |
ts_log "list checksums from new data"
|
|
|
531551 |
diff -up util-linux-2.23.2/tests/ts/libmount/context-utab.kzak util-linux-2.23.2/tests/ts/libmount/context-utab
|
|
|
531551 |
--- util-linux-2.23.2/tests/ts/libmount/context-utab.kzak 2013-06-13 09:46:10.561651827 +0200
|
|
|
531551 |
+++ util-linux-2.23.2/tests/ts/libmount/context-utab 2013-09-09 10:01:23.355469268 +0200
|
|
|
531551 |
@@ -85,7 +85,9 @@ grep -q $DEVICE $LIBMOUNT_UTAB && \
|
|
|
531551 |
echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1
|
|
|
531551 |
ts_finalize_subtest
|
|
|
531551 |
|
|
|
531551 |
+
|
|
|
531551 |
if [ -x "/sbin/mkfs.btrfs" ]; then
|
|
|
531551 |
+ $TS_CMD_WIPEFS -a $DEVICE &> /dev/null
|
|
|
531551 |
ts_log "Create filesystem [btrfs]"
|
|
|
531551 |
/sbin/mkfs.btrfs -L "$LABEL" $DEVICE &> /dev/null
|
|
|
531551 |
udevadm settle
|