diff options
author | Tim Rice <tim@multitalents.net> | 2007-07-24 21:16:07 -0700 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2007-07-24 21:16:07 -0700 |
commit | ffe3a8ec7e53325636f70b35c141578c4d21f200 (patch) | |
tree | 9b41abd9046c533429ea15e0da5501e8d7651188 | |
parent | bf0212d1b751fa6f6844607b2bd12544b0ed90e4 (diff) |
- (tim) [buildpkg.sh.in openssh.xml.in] Allow more flexibility where smf(5)
files are installed.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | buildpkg.sh.in | 20 | ||||
-rw-r--r-- | openssh.xml.in | 2 |
3 files changed, 16 insertions, 10 deletions
@@ -2,6 +2,8 @@ | |||
2 | - (tim) [openssh.xml.in] make FMRI match what package scripts use. | 2 | - (tim) [openssh.xml.in] make FMRI match what package scripts use. |
3 | - (tim) [openbsd-compat/regress/closefromtest.c] Bug 1345: fix open() call. | 3 | - (tim) [openbsd-compat/regress/closefromtest.c] Bug 1345: fix open() call. |
4 | Report/patch by David.Leonard AT quest.com | 4 | Report/patch by David.Leonard AT quest.com |
5 | - (tim) [buildpkg.sh.in openssh.xml.in] Allow more flexibility where smf(5) | ||
6 | files are installed. | ||
5 | 7 | ||
6 | 20070628 | 8 | 20070628 |
7 | - (djm) bz#1325: Fix SELinux in permissive mode where it would | 9 | - (djm) bz#1325: Fix SELinux in permissive mode where it would |
@@ -3114,4 +3116,4 @@ | |||
3114 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3116 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3115 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3117 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3116 | 3118 | ||
3117 | $Id: ChangeLog,v 1.4713 2007/07/25 03:54:09 tim Exp $ | 3119 | $Id: ChangeLog,v 1.4714 2007/07/25 04:16:07 tim Exp $ |
diff --git a/buildpkg.sh.in b/buildpkg.sh.in index 8a96b9050..598056796 100644 --- a/buildpkg.sh.in +++ b/buildpkg.sh.in | |||
@@ -49,6 +49,8 @@ PKG_REQUEST_LOCAL=../pkg-request.local | |||
49 | OPENSSHD=opensshd.init | 49 | OPENSSHD=opensshd.init |
50 | OPENSSH_MANIFEST=openssh.xml | 50 | OPENSSH_MANIFEST=openssh.xml |
51 | OPENSSH_FMRI=svc:/site/${SYSVINIT_NAME}:default | 51 | OPENSSH_FMRI=svc:/site/${SYSVINIT_NAME}:default |
52 | SMF_METHOD_DIR=/lib/svc/method/site | ||
53 | SMF_MANIFEST_DIR=/var/svc/manifest/site | ||
52 | 54 | ||
53 | PATH_GROUPADD_PROG=@PATH_GROUPADD_PROG@ | 55 | PATH_GROUPADD_PROG=@PATH_GROUPADD_PROG@ |
54 | PATH_USERADD_PROG=@PATH_USERADD_PROG@ | 56 | PATH_USERADD_PROG=@PATH_USERADD_PROG@ |
@@ -196,15 +198,17 @@ then | |||
196 | # For Solaris' SMF, /lib/svc/method/site is the preferred place | 198 | # For Solaris' SMF, /lib/svc/method/site is the preferred place |
197 | # for start/stop scripts that aren't supplied with the OS, and | 199 | # for start/stop scripts that aren't supplied with the OS, and |
198 | # similarly /var/svc/manifest/site for manifests. | 200 | # similarly /var/svc/manifest/site for manifests. |
199 | mkdir -p $FAKE_ROOT${TEST_DIR}/lib/svc/method/site | 201 | mkdir -p $FAKE_ROOT${TEST_DIR}${SMF_METHOD_DIR} |
200 | mkdir -p $FAKE_ROOT${TEST_DIR}/var/svc/manifest/site | 202 | mkdir -p $FAKE_ROOT${TEST_DIR}${SMF_MANIFEST_DIR} |
201 | 203 | ||
202 | cp ${OPENSSHD} $FAKE_ROOT${TEST_DIR}/lib/svc/method/site/${SYSVINIT_NAME} | 204 | cp ${OPENSSHD} $FAKE_ROOT${TEST_DIR}${SMF_METHOD_DIR}/${SYSVINIT_NAME} |
203 | chmod 744 $FAKE_ROOT${TEST_DIR}/lib/svc/method/site/${SYSVINIT_NAME} | 205 | chmod 744 $FAKE_ROOT${TEST_DIR}${SMF_METHOD_DIR}/${SYSVINIT_NAME} |
204 | 206 | ||
205 | cat ${OPENSSH_MANIFEST} | sed "s|__SYSVINIT_NAME__|${SYSVINIT_NAME}|" \ | 207 | cat ${OPENSSH_MANIFEST} | \ |
206 | > $FAKE_ROOT${TEST_DIR}/var/svc/manifest/site/${SYSVINIT_NAME}.xml | 208 | sed -e "s|__SYSVINIT_NAME__|${SYSVINIT_NAME}|" \ |
207 | chmod 644 $FAKE_ROOT${TEST_DIR}/var/svc/manifest/site/${SYSVINIT_NAME}.xml | 209 | -e "s|__SMF_METHOD_DIR__|${SMF_METHOD_DIR}|" \ |
210 | > $FAKE_ROOT${TEST_DIR}${SMF_MANIFEST_DIR}/${SYSVINIT_NAME}.xml | ||
211 | chmod 644 $FAKE_ROOT${TEST_DIR}${SMF_MANIFEST_DIR}/${SYSVINIT_NAME}.xml | ||
208 | else | 212 | else |
209 | mkdir -p $FAKE_ROOT${TEST_DIR}/etc/init.d | 213 | mkdir -p $FAKE_ROOT${TEST_DIR}/etc/init.d |
210 | 214 | ||
@@ -336,7 +340,7 @@ then | |||
336 | svccfg delete -f $OPENSSH_FMRI | 340 | svccfg delete -f $OPENSSH_FMRI |
337 | fi | 341 | fi |
338 | # NOTE, The manifest disables sshd by default. | 342 | # NOTE, The manifest disables sshd by default. |
339 | svccfg import ${TEST_DIR}/var/svc/manifest/site/${SYSVINIT_NAME}.xml | 343 | svccfg import ${TEST_DIR}${SMF_MANIFEST_DIR}/${SYSVINIT_NAME}.xml |
340 | else | 344 | else |
341 | if [ "\${USE_SYM_LINKS}" = yes ] | 345 | if [ "\${USE_SYM_LINKS}" = yes ] |
342 | then | 346 | then |
diff --git a/openssh.xml.in b/openssh.xml.in index 96c5aeba4..8afe1d366 100644 --- a/openssh.xml.in +++ b/openssh.xml.in | |||
@@ -56,7 +56,7 @@ | |||
56 | <exec_method | 56 | <exec_method |
57 | name='start' | 57 | name='start' |
58 | type='method' | 58 | type='method' |
59 | exec='/lib/svc/method/site/__SYSVINIT_NAME__ start' | 59 | exec='__SMF_METHOD_DIR__/__SYSVINIT_NAME__ start' |
60 | timeout_seconds='60'> | 60 | timeout_seconds='60'> |
61 | <method_context/> | 61 | <method_context/> |
62 | </exec_method> | 62 | </exec_method> |