summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--buildpkg.sh.in20
2 files changed, 14 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 796656601..5df4094c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120121019
2 - (tim) [buildpkg.sh.in] Double up on some backslashes so they end up in
3 the generated file as intended.
4
120121005 520121005
2 - (dtucker) OpenBSD CVS Sync 6 - (dtucker) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2012/09/17 09:54:44 7 - djm@cvs.openbsd.org 2012/09/17 09:54:44
diff --git a/buildpkg.sh.in b/buildpkg.sh.in
index 4de9d42e4..4b842b3f7 100644
--- a/buildpkg.sh.in
+++ b/buildpkg.sh.in
@@ -337,17 +337,17 @@ then
337else 337else
338 if [ "\${USE_SYM_LINKS}" = yes ] 338 if [ "\${USE_SYM_LINKS}" = yes ]
339 then 339 then
340 [ "$RCS_D" = yes ] && \ 340 [ "$RCS_D" = yes ] && \\
341 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rcS.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s 341 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rcS.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s
342 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc0.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s 342 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc0.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s
343 [ "$RC1_D" = no ] || \ 343 [ "$RC1_D" = no ] || \\
344 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc1.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s 344 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc1.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s
345 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc2.d/${SYSVINITSTART}${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s 345 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc2.d/${SYSVINITSTART}${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s
346 else 346 else
347 [ "$RCS_D" = yes ] && \ 347 [ "$RCS_D" = yes ] && \\
348 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rcS.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=\${PKG_INSTALL_ROOT}$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l 348 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rcS.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=\${PKG_INSTALL_ROOT}$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l
349 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc0.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=\${PKG_INSTALL_ROOT}$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l 349 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc0.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=\${PKG_INSTALL_ROOT}$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l
350 [ "$RC1_D" = no ] || \ 350 [ "$RC1_D" = no ] || \\
351 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc1.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=\${PKG_INSTALL_ROOT}$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l 351 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc1.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=\${PKG_INSTALL_ROOT}$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l
352 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc2.d/${SYSVINITSTART}${SYSVINIT_NAME}=\${PKG_INSTALL_ROOT}$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l 352 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc2.d/${SYSVINITSTART}${SYSVINIT_NAME}=\${PKG_INSTALL_ROOT}$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l
353 fi 353 fi
@@ -538,10 +538,10 @@ then
538PRE_INS_STOP=no 538PRE_INS_STOP=no
539POST_INS_START=no 539POST_INS_START=no
540# determine if should restart the daemon 540# determine if should restart the daemon
541if [ -s ${piddir}/sshd.pid ] && \ 541if [ -s ${piddir}/sshd.pid ] && \\
542 /usr/bin/svcs -H $OPENSSH_FMRI 2>&1 | egrep "^online" > /dev/null 2>&1 542 /usr/bin/svcs -H $OPENSSH_FMRI 2>&1 | egrep "^online" > /dev/null 2>&1
543then 543then
544 ans=\`ckyorn -d n \ 544 ans=\`ckyorn -d n \\
545-p "Should the running sshd daemon be restarted? ${DEF_MSG}"\` || exit \$? 545-p "Should the running sshd daemon be restarted? ${DEF_MSG}"\` || exit \$?
546 case \$ans in 546 case \$ans in
547 [y,Y]*) PRE_INS_STOP=yes 547 [y,Y]*) PRE_INS_STOP=yes
@@ -552,7 +552,7 @@ then
552else 552else
553 553
554# determine if we should start sshd 554# determine if we should start sshd
555 ans=\`ckyorn -d n \ 555 ans=\`ckyorn -d n \\
556-p "Start the sshd daemon after installing this package? ${DEF_MSG}"\` || exit \$? 556-p "Start the sshd daemon after installing this package? ${DEF_MSG}"\` || exit \$?
557 case \$ans in 557 case \$ans in
558 [y,Y]*) POST_INS_START=yes ;; 558 [y,Y]*) POST_INS_START=yes ;;
@@ -573,7 +573,7 @@ USE_SYM_LINKS=no
573PRE_INS_STOP=no 573PRE_INS_STOP=no
574POST_INS_START=no 574POST_INS_START=no
575# Use symbolic links? 575# Use symbolic links?
576ans=\`ckyorn -d n \ 576ans=\`ckyorn -d n \\
577-p "Do you want symbolic links for the start/stop scripts? ${DEF_MSG}"\` || exit \$? 577-p "Do you want symbolic links for the start/stop scripts? ${DEF_MSG}"\` || exit \$?
578case \$ans in 578case \$ans in
579 [y,Y]*) USE_SYM_LINKS=yes ;; 579 [y,Y]*) USE_SYM_LINKS=yes ;;
@@ -582,7 +582,7 @@ esac
582# determine if should restart the daemon 582# determine if should restart the daemon
583if [ -s ${piddir}/sshd.pid -a -f ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} ] 583if [ -s ${piddir}/sshd.pid -a -f ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} ]
584then 584then
585 ans=\`ckyorn -d n \ 585 ans=\`ckyorn -d n \\
586-p "Should the running sshd daemon be restarted? ${DEF_MSG}"\` || exit \$? 586-p "Should the running sshd daemon be restarted? ${DEF_MSG}"\` || exit \$?
587 case \$ans in 587 case \$ans in
588 [y,Y]*) PRE_INS_STOP=yes 588 [y,Y]*) PRE_INS_STOP=yes
@@ -593,7 +593,7 @@ then
593else 593else
594 594
595# determine if we should start sshd 595# determine if we should start sshd
596 ans=\`ckyorn -d n \ 596 ans=\`ckyorn -d n \\
597-p "Start the sshd daemon after installing this package? ${DEF_MSG}"\` || exit \$? 597-p "Start the sshd daemon after installing this package? ${DEF_MSG}"\` || exit \$?
598 case \$ans in 598 case \$ans in
599 [y,Y]*) POST_INS_START=yes ;; 599 [y,Y]*) POST_INS_START=yes ;;