From: Christian Hofstaedtler <ch@grml.org>
Date: Wed, 25 May 2011 14:15:13 +0000 (+0200)
Subject: Resync ssh initscript with Debian
X-Git-Tag: v1.2.11~1
X-Git-Url: http://git.grml.org/?p=grml-etc.git;a=commitdiff_plain;h=281e66b2740324eb9c6e711d89111a62b9f086c7

Resync ssh initscript with Debian
---

diff --git a/etc/init.d/ssh b/etc/init.d/ssh
index 82af0f1..d632833 100755
--- a/etc/init.d/ssh
+++ b/etc/init.d/ssh
@@ -1,11 +1,11 @@
-#!/bin/sh
+#! /bin/sh
 
 ### BEGIN INIT INFO
 # Provides:		sshd
 # Required-Start:	$remote_fs $syslog
 # Required-Stop:	$remote_fs $syslog
 # Default-Start:	2 3 4 5
-# Default-Stop:		1
+# Default-Stop:		
 # Short-Description:	OpenBSD Secure Shell server
 ### END INIT INFO
 
@@ -19,17 +19,12 @@ set -e
 test -x /usr/sbin/sshd || exit 0
 ( /usr/sbin/sshd -\? 2>&1 | grep -q OpenSSH ) 2>/dev/null || exit 0
 
-export SSHD_OOM_ADJUST=-17
+umask 022
+
 if test -f /etc/default/ssh; then
     . /etc/default/ssh
 fi
 
-# Are we in a virtual environment that doesn't support modifying
-# /proc/self/oom_adj?
-if grep -q 'envID:.*[1-9]' /proc/self/status; then
-    unset SSHD_OOM_ADJUST
-fi
-
 . /lib/lsb/init-functions
 
 if [ -n "$2" ]; then
@@ -101,7 +96,7 @@ case "$1" in
 	fi
 
 	if ! test -f $RSA_KEY ; then
-	   log_action_msg "Generating SSH RSA host key..."
+	   log_action_msg "Generating SSH2 RSA host key..."
 	   $KEYGEN -t rsa -f $RSA_KEY -C '' -N '' || exit 1
 	fi