diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-12 12:16:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-02-12 12:16:40 +0000 |
commit | a7ab96dac4597c0c34ffe22a5d92a83a2e579edf (patch) | |
tree | d97cf8c0ac45d3388ce848bab804729f66e70560 /debian/systemd | |
parent | 0cf4774e31e0a190a2399591a99f6a05c948f268 (diff) |
Remove unnecessary /dev/null tests
Remove tests for whether /dev/null is a character device from the Upstart
job and the systemd service files; it's there to avoid a confusing failure
mode in daemon(), but with modern init systems we use the -D option to
suppress daemonisation anyway.
Diffstat (limited to 'debian/systemd')
-rw-r--r-- | debian/systemd/ssh.service | 1 | ||||
-rw-r--r-- | debian/systemd/ssh@.service | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/debian/systemd/ssh.service b/debian/systemd/ssh.service index 6f69923f1..e7209f75a 100644 --- a/debian/systemd/ssh.service +++ b/debian/systemd/ssh.service | |||
@@ -5,7 +5,6 @@ ConditionPathExists=!/etc/ssh/sshd_not_to_be_run | |||
5 | 5 | ||
6 | [Service] | 6 | [Service] |
7 | EnvironmentFile=-/etc/default/ssh | 7 | EnvironmentFile=-/etc/default/ssh |
8 | ExecStartPre=/usr/bin/test -c /dev/null | ||
9 | ExecStart=/usr/sbin/sshd -D $SSHD_OPTS | 8 | ExecStart=/usr/sbin/sshd -D $SSHD_OPTS |
10 | ExecReload=/bin/kill -HUP $MAINPID | 9 | ExecReload=/bin/kill -HUP $MAINPID |
11 | KillMode=process | 10 | KillMode=process |
diff --git a/debian/systemd/ssh@.service b/debian/systemd/ssh@.service index c2f9b1547..4b0801dbc 100644 --- a/debian/systemd/ssh@.service +++ b/debian/systemd/ssh@.service | |||
@@ -4,6 +4,5 @@ After=auditd.service | |||
4 | 4 | ||
5 | [Service] | 5 | [Service] |
6 | EnvironmentFile=-/etc/default/ssh | 6 | EnvironmentFile=-/etc/default/ssh |
7 | ExecStartPre=/usr/bin/test -c /dev/null | ||
8 | ExecStart=-/usr/sbin/sshd -i $SSHD_OPTS | 7 | ExecStart=-/usr/sbin/sshd -i $SSHD_OPTS |
9 | StandardInput=socket | 8 | StandardInput=socket |