diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-10-10 16:12:36 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-10-10 16:19:21 -0400 |
| commit | 0badb5a5621fba6a24ee4848301c700c2604e37e (patch) | |
| tree | 0c6c1086487c688c4f3543a285731e17899b2bc7 | |
| parent | d804ec5b59613dd1347cf8165bbe507d0b02bf95 (diff) | |
| download | illumos-joyent-0badb5a5621fba6a24ee4848301c700c2604e37e.tar.gz | |
Oops, need to skip /etc/motd for 'su - ...'
Also spell /opt/zfs-tests/ properly.
| -rwxr-xr-x | usr/src/test/smartos-test/smartos-test.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/test/smartos-test/smartos-test.sh b/usr/src/test/smartos-test/smartos-test.sh index 740b75c169..cc2055dc8f 100755 --- a/usr/src/test/smartos-test/smartos-test.sh +++ b/usr/src/test/smartos-test/smartos-test.sh @@ -284,7 +284,7 @@ EOF function zfs_test_check { # DISKS is set either in our environment, or in the .profile of ~ztest. zprofile=/zones/global/ztest/.profile - zdisksvar=$(su - ztest -c 'echo $DISKS') + zdisksvar=$(su - ztest -c 'echo $DISKS' | tail -1) # Check for KEEP too. grep -q ^KEEP= $zprofile || \ @@ -309,7 +309,7 @@ function zfs_test_check { fi # OKAY, now we can run it! - log_test zfstest su - ztest -c /opt/zfs-test/bin/zfstest + log_test zfstest su - ztest -c /opt/zfs-tests/bin/zfstest } # |