51c51
< OPENSSH_FMRI=svc:/site/openssh:default
---
> OPENSSH_FMRI=svc:/site/${SYSVINIT_NAME}:default
205,206c205,207
< cp ${OPENSSH_MANIFEST} $FAKE_ROOT${TEST_DIR}/var/svc/manifest/site
< chmod 644 $FAKE_ROOT${TEST_DIR}/var/svc/manifest/site/${OPENSSH_MANIFEST}
---
> cat ${OPENSSH_MANIFEST} | sed "s|__SYSVINIT_NAME__|${SYSVINIT_NAME}|" \
> > $FAKE_ROOT${TEST_DIR}/var/svc/manifest/site/${SYSVINIT_NAME}.xml
> chmod 644 $FAKE_ROOT${TEST_DIR}/var/svc/manifest/site/${SYSVINIT_NAME}.xml
337,339c338,339
< # NOTE, if manifest enables sshd by default, this will actually
< # start the daemon, which may not be what the user wants.
< svccfg import ${TEST_DIR}/var/svc/manifest/site/$OPENSSH_MANIFEST
---
> # NOTE, The manifest disables sshd by default.
> svccfg import ${TEST_DIR}/var/svc/manifest/site/${SYSVINIT_NAME}.xml
431,432d430
< # See svccfg import note above. The service may already
< # be started.
547c545
< /usr/bin/svcs $OPENSSH_FMRI 2>&1 | egrep "^online" > /dev/null 2>&1
---
> /usr/bin/svcs -H $OPENSSH_FMRI 2>&1 | egrep "^online" > /dev/null 2>&1