diff options
author | Tim Rice <tim@multitalents.net> | 2007-03-01 09:34:52 -0800 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2007-03-01 09:34:52 -0800 |
commit | c3af6d4d130a35120713d937e7d5efc933e86c3a (patch) | |
tree | 27f23392800149575e8bfc55cfa9e7905074926d /buildpkg.sh.in | |
parent | 1d75f22c5d99ce1a4c7a87c7ae042a33fbeefefb (diff) |
- (tim) [buildpkg.sh.in openssh.xml.in] Clean up Solaris 10 smf(5) bits.
"Looks sane" dtucker@
Diffstat (limited to 'buildpkg.sh.in')
-rw-r--r-- | buildpkg.sh.in | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/buildpkg.sh.in b/buildpkg.sh.in index 17349f7fc..8a96b9050 100644 --- a/buildpkg.sh.in +++ b/buildpkg.sh.in | |||
@@ -48,7 +48,7 @@ PKG_REQUEST_LOCAL=../pkg-request.local | |||
48 | # | 48 | # |
49 | OPENSSHD=opensshd.init | 49 | OPENSSHD=opensshd.init |
50 | OPENSSH_MANIFEST=openssh.xml | 50 | OPENSSH_MANIFEST=openssh.xml |
51 | OPENSSH_FMRI=svc:/site/openssh:default | 51 | OPENSSH_FMRI=svc:/site/${SYSVINIT_NAME}:default |
52 | 52 | ||
53 | PATH_GROUPADD_PROG=@PATH_GROUPADD_PROG@ | 53 | PATH_GROUPADD_PROG=@PATH_GROUPADD_PROG@ |
54 | PATH_USERADD_PROG=@PATH_USERADD_PROG@ | 54 | PATH_USERADD_PROG=@PATH_USERADD_PROG@ |
@@ -202,8 +202,9 @@ then | |||
202 | cp ${OPENSSHD} $FAKE_ROOT${TEST_DIR}/lib/svc/method/site/${SYSVINIT_NAME} | 202 | cp ${OPENSSHD} $FAKE_ROOT${TEST_DIR}/lib/svc/method/site/${SYSVINIT_NAME} |
203 | chmod 744 $FAKE_ROOT${TEST_DIR}/lib/svc/method/site/${SYSVINIT_NAME} | 203 | chmod 744 $FAKE_ROOT${TEST_DIR}/lib/svc/method/site/${SYSVINIT_NAME} |
204 | 204 | ||
205 | cp ${OPENSSH_MANIFEST} $FAKE_ROOT${TEST_DIR}/var/svc/manifest/site | 205 | cat ${OPENSSH_MANIFEST} | sed "s|__SYSVINIT_NAME__|${SYSVINIT_NAME}|" \ |
206 | chmod 644 $FAKE_ROOT${TEST_DIR}/var/svc/manifest/site/${OPENSSH_MANIFEST} | 206 | > $FAKE_ROOT${TEST_DIR}/var/svc/manifest/site/${SYSVINIT_NAME}.xml |
207 | chmod 644 $FAKE_ROOT${TEST_DIR}/var/svc/manifest/site/${SYSVINIT_NAME}.xml | ||
207 | else | 208 | else |
208 | mkdir -p $FAKE_ROOT${TEST_DIR}/etc/init.d | 209 | mkdir -p $FAKE_ROOT${TEST_DIR}/etc/init.d |
209 | 210 | ||
@@ -334,9 +335,8 @@ then | |||
334 | then | 335 | then |
335 | svccfg delete -f $OPENSSH_FMRI | 336 | svccfg delete -f $OPENSSH_FMRI |
336 | fi | 337 | fi |
337 | # NOTE, if manifest enables sshd by default, this will actually | 338 | # NOTE, The manifest disables sshd by default. |
338 | # start the daemon, which may not be what the user wants. | 339 | svccfg import ${TEST_DIR}/var/svc/manifest/site/${SYSVINIT_NAME}.xml |
339 | svccfg import ${TEST_DIR}/var/svc/manifest/site/$OPENSSH_MANIFEST | ||
340 | else | 340 | else |
341 | if [ "\${USE_SYM_LINKS}" = yes ] | 341 | if [ "\${USE_SYM_LINKS}" = yes ] |
342 | then | 342 | then |
@@ -428,8 +428,6 @@ if [ "\${POST_INS_START}" = "yes" ] | |||
428 | then | 428 | then |
429 | if [ $DO_SMF -eq 1 ] | 429 | if [ $DO_SMF -eq 1 ] |
430 | then | 430 | then |
431 | # See svccfg import note above. The service may already | ||
432 | # be started. | ||
433 | svcadm enable $OPENSSH_FMRI | 431 | svcadm enable $OPENSSH_FMRI |
434 | else | 432 | else |
435 | ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} start | 433 | ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} start |
@@ -544,7 +542,7 @@ PRE_INS_STOP=no | |||
544 | POST_INS_START=no | 542 | POST_INS_START=no |
545 | # determine if should restart the daemon | 543 | # determine if should restart the daemon |
546 | if [ -s ${piddir}/sshd.pid ] && \ | 544 | if [ -s ${piddir}/sshd.pid ] && \ |
547 | /usr/bin/svcs $OPENSSH_FMRI 2>&1 | egrep "^online" > /dev/null 2>&1 | 545 | /usr/bin/svcs -H $OPENSSH_FMRI 2>&1 | egrep "^online" > /dev/null 2>&1 |
548 | then | 546 | then |
549 | ans=\`ckyorn -d n \ | 547 | ans=\`ckyorn -d n \ |
550 | -p "Should the running sshd daemon be restarted? ${DEF_MSG}"\` || exit \$? | 548 | -p "Should the running sshd daemon be restarted? ${DEF_MSG}"\` || exit \$? |