projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/github/pr/123'
[grml-live.git]
/
etc
/
grml
/
fai
/
config
/
files
/
etc
/
systemd
/
system
/
ssh.service
/
GRMLBASE
diff --git
a/etc/grml/fai/config/files/etc/systemd/system/ssh.service/GRMLBASE
b/etc/grml/fai/config/files/etc/systemd/system/ssh.service/GRMLBASE
index
e41b058
..
3a6729e
100644
(file)
--- a/
etc/grml/fai/config/files/etc/systemd/system/ssh.service/GRMLBASE
+++ b/
etc/grml/fai/config/files/etc/systemd/system/ssh.service/GRMLBASE
@@
-7,8
+7,7
@@
ConditionPathExists=!/etc/ssh/sshd_not_to_be_run
[Service]
EnvironmentFile=-/etc/default/ssh
[Service]
EnvironmentFile=-/etc/default/ssh
-ExecStartPre=-/bin/sh -c "/usr/bin/ssh-keygen -A"
-ExecStartPre=/usr/sbin/sshd -t
+ExecStartPre=-/usr/bin/ssh-keygen -A
ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
ExecReload=/usr/sbin/sshd -t
ExecReload=/bin/kill -HUP $MAINPID
ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
ExecReload=/usr/sbin/sshd -t
ExecReload=/bin/kill -HUP $MAINPID