diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | buildpkg.sh.in | 16 | ||||
-rw-r--r-- | openssh.xml.in | 5 |
3 files changed, 14 insertions, 11 deletions
@@ -6,6 +6,8 @@ | |||
6 | block as its interaction with KbdInteractive makes it difficult to | 6 | block as its interaction with KbdInteractive makes it difficult to |
7 | support. Also, relocate the CR/kbdint option special-case code into | 7 | support. Also, relocate the CR/kbdint option special-case code into |
8 | servconf. "please commit" djm@, ok markus@ for the relocation. | 8 | servconf. "please commit" djm@, ok markus@ for the relocation. |
9 | - (tim) [buildpkg.sh.in openssh.xml.in] Clean up Solaris 10 smf(5) bits. | ||
10 | "Looks sane" dtucker@ | ||
9 | 11 | ||
10 | 20070228 | 12 | 20070228 |
11 | - (dtucker) OpenBSD CVS Sync | 13 | - (dtucker) OpenBSD CVS Sync |
@@ -2782,4 +2784,4 @@ | |||
2782 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 2784 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
2783 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 2785 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
2784 | 2786 | ||
2785 | $Id: ChangeLog,v 1.4625 2007/03/01 10:31:28 dtucker Exp $ | 2787 | $Id: ChangeLog,v 1.4626 2007/03/01 17:34:52 tim Exp $ |
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 \$? |
diff --git a/openssh.xml.in b/openssh.xml.in index 655ee5c9e..2fcdea0a1 100644 --- a/openssh.xml.in +++ b/openssh.xml.in | |||
@@ -23,6 +23,9 @@ | |||
23 | type='service' | 23 | type='service' |
24 | version='1'> | 24 | version='1'> |
25 | 25 | ||
26 | <!-- | ||
27 | We default to disabled so administrator can decide to enable or not. | ||
28 | --> | ||
26 | <create_default_instance enabled='false'/> | 29 | <create_default_instance enabled='false'/> |
27 | 30 | ||
28 | <single_instance/> | 31 | <single_instance/> |
@@ -53,7 +56,7 @@ | |||
53 | <exec_method | 56 | <exec_method |
54 | name='start' | 57 | name='start' |
55 | type='method' | 58 | type='method' |
56 | exec='/lib/svc/method/site/opensshd start' | 59 | exec='/lib/svc/method/site/__SYSVINIT_NAME__ start' |
57 | timeout_seconds='60'> | 60 | timeout_seconds='60'> |
58 | <method_context/> | 61 | <method_context/> |
59 | </exec_method> | 62 | </exec_method> |