- (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@

3 files changed, 12 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 5fa01b32d..da8a70a7f 100644
--- 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
@@ -3718,4 +3722,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4093 2006/01/20 00:31:47 dtucker Exp $
+$Id: ChangeLog,v 1.4094 2006/01/29 13:22:39 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index a9654cbde..70e26deea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.321 2006/01/01 10:03:30 djm Exp $
+# $Id: configure.ac,v 1.322 2006/01/29 13:22:39 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -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 ffa7cdac2..c36c5c88a 100755
--- 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.