diff options
| author | Tim Foster <tim.foster@joyent.com> | 2019-10-08 15:54:21 +0000 |
|---|---|---|
| committer | Tim Foster <tim.foster@joyent.com> | 2019-10-08 15:54:21 +0000 |
| commit | 9735ee6d0ccb49efeeca27f68be0d4f2eb3d8126 (patch) | |
| tree | fa06eb704fdb289d8aecde9a844560ccbaf92eed /usr/src/test/smartos-test | |
| parent | 82884c9c62cfc7a3ec02b52e9b013103f1929d51 (diff) | |
| download | illumos-joyent-grr-OS-7943.tar.gz | |
Removing Readme.smartos and addressing sh and Makefile nitsgrr-OS-7943
Diffstat (limited to 'usr/src/test/smartos-test')
| -rw-r--r-- | usr/src/test/smartos-test/Makefile | 2 | ||||
| -rwxr-xr-x | usr/src/test/smartos-test/smartos-test.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/test/smartos-test/Makefile b/usr/src/test/smartos-test/Makefile index a182a3a118..1277987fac 100644 --- a/usr/src/test/smartos-test/Makefile +++ b/usr/src/test/smartos-test/Makefile @@ -28,7 +28,7 @@ $(ROOTPROGS) := FILEMODE = 0555 ROOTFILES= $(FILES:%=$(ROOTOPTPKG)/%) $(ROOTFILES) := FILEMODE = 0444 -all lint clean clobber: +all clean clobber: install: $(ROOTPROGS) $(ROOTFILES) diff --git a/usr/src/test/smartos-test/smartos-test.sh b/usr/src/test/smartos-test/smartos-test.sh index 83cf30c46d..7cc32db76d 100755 --- a/usr/src/test/smartos-test/smartos-test.sh +++ b/usr/src/test/smartos-test/smartos-test.sh @@ -175,7 +175,7 @@ function add_loopback_mounts { log_must tar -xzf $test_archive -C $lofs_home ./usr # keep /usr read-only in an attempt to preserve smartos behaviour # unless specifically asked to - if [[ "$MOUNT_USR_RW" = "true" ]]; then + if [[ "$mount_usr_rw" = "true" ]]; then mount_opts="-o rw" else mount_opts="-o ro" @@ -295,7 +295,7 @@ function usage { echo " -w when mounting the lofs /usr, make it writable" } -MOUNT_USR_RW=false +mount_usr_rw=false skip_version_check=false do_configure=false do_execute=false @@ -323,7 +323,7 @@ while getopts "cefrwh" opt; do exit 2 ;; w) - MOUNT_USR_RW=true + mount_usr_rw=true ;; *) log "unknown argument ${opt}" |