diff options
Diffstat (limited to 'buildpkg.sh.in')
-rw-r--r-- | buildpkg.sh.in | 20 |
1 files changed, 12 insertions, 8 deletions
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 |