projects
/
grml-etc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
20a1e40
)
Resync ssh initscript with Debian
author
Christian Hofstaedtler
<ch@grml.org>
Wed, 25 May 2011 14:15:13 +0000
(16:15 +0200)
committer
Christian Hofstaedtler
<ch@grml.org>
Wed, 25 May 2011 14:15:13 +0000
(16:15 +0200)
etc/init.d/ssh
patch
|
blob
|
history
diff --git
a/etc/init.d/ssh
b/etc/init.d/ssh
index
82af0f1
..
d632833
100755
(executable)
--- 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
### 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
# 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
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
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
. /lib/lsb/init-functions
if [ -n "$2" ]; then
@@
-101,7
+96,7
@@
case "$1" in
fi
if ! test -f $RSA_KEY ; then
fi
if ! test -f $RSA_KEY ; then
- log_action_msg "Generating SSH RSA host key..."
+ log_action_msg "Generating SSH
2
RSA host key..."
$KEYGEN -t rsa -f $RSA_KEY -C '' -N '' || exit 1
fi
$KEYGEN -t rsa -f $RSA_KEY -C '' -N '' || exit 1
fi