- (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the

   opensshd.init script interpretter if /sbin/sh does not exist.  ok tim@

diff --git a/ChangeLog b/ChangeLog
index aae0444411bd6f283fb59e9b9dd97e3777a6bd40..ea0ac998c5cdf72f7663a1b86c25c17df11b5062 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20060129
+ - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the
+   opensshd.init script interpretter if /sbin/sh does not exist.  ok tim@
+
 20060120
  - (dtucker) OpenBSD CVS Sync
    - jmc@cvs.openbsd.org 2006/01/15 17:37:05

diff --git a/configure.ac b/configure.ac
index d8f90c9f8ee39e13f759a7f7daec69b9645dd54f..4fedaaae5d1ac5433f28974f53def5da8d5cb395 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -47,6 +47,11 @@ AC_PATH_PROG(PATH_GROUPADD_PROG, groupadd, groupadd,
 AC_PATH_PROG(PATH_USERADD_PROG, useradd, useradd,
        [/usr/sbin${PATH_SEPARATOR}/etc])
 AC_CHECK_PROG(MAKE_PACKAGE_SUPPORTED, pkgmk, yes, no)
+if test -x /sbin/sh; then
+       AC_SUBST(STARTUP_SCRIPT_SHELL,/sbin/sh)
+else
+       AC_SUBST(STARTUP_SCRIPT_SHELL,/bin/sh)
+fi
 
 # System features
 AC_SYS_LARGEFILE

diff --git a/opensshd.init.in b/opensshd.init.in
index ffa7cdac21ff970d3545d860e37ad658382df29d..c36c5c88aed599e851279642138583fbee616095 100755 (executable)
--- a/opensshd.init.in
+++ b/opensshd.init.in
@@ -1,4 +1,4 @@
-#!/sbin/sh
+#!@STARTUP_SCRIPT_SHELL@
 # Donated code that was put under PD license.
 #
 # Stripped PRNGd out of it for the time being.