summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-02-12 12:16:35 +0000
committerColin Watson <cjwatson@debian.org>2014-02-12 12:16:40 +0000
commita7ab96dac4597c0c34ffe22a5d92a83a2e579edf (patch)
treed97cf8c0ac45d3388ce848bab804729f66e70560 /debian
parent0cf4774e31e0a190a2399591a99f6a05c948f268 (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')
-rw-r--r--debian/changelog4
-rw-r--r--debian/openssh-server.ssh.upstart1
-rw-r--r--debian/systemd/ssh.service1
-rw-r--r--debian/systemd/ssh@.service1
4 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index cb6f489d7..a4af41d36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ openssh (1:6.5p1-3) UNRELEASED; urgency=medium
10 and Michael Biebl). 10 and Michael Biebl).
11 * Bump guard version for sysvinit->systemd transition to 1:6.5p1-3; we may 11 * Bump guard version for sysvinit->systemd transition to 1:6.5p1-3; we may
12 have got it wrong before, and it's fairly harmless to repeat it. 12 have got it wrong before, and it's fairly harmless to repeat it.
13 * Remove tests for whether /dev/null is a character device from the
14 Upstart job and the systemd service files; it's there to avoid a
15 confusing failure mode in daemon(), but with modern init systems we use
16 the -D option to suppress daemonisation anyway.
13 17
14 -- Colin Watson <cjwatson@debian.org> Tue, 11 Feb 2014 21:36:14 +0000 18 -- Colin Watson <cjwatson@debian.org> Tue, 11 Feb 2014 21:36:14 +0000
15 19
diff --git a/debian/openssh-server.ssh.upstart b/debian/openssh-server.ssh.upstart
index 10ab744f1..b34cbff5d 100644
--- a/debian/openssh-server.ssh.upstart
+++ b/debian/openssh-server.ssh.upstart
@@ -20,7 +20,6 @@ console none
20pre-start script 20pre-start script
21 test -x /usr/sbin/sshd || { stop; exit 0; } 21 test -x /usr/sbin/sshd || { stop; exit 0; }
22 test -e /etc/ssh/sshd_not_to_be_run && { stop; exit 0; } 22 test -e /etc/ssh/sshd_not_to_be_run && { stop; exit 0; }
23 test -c /dev/null || { stop; exit 0; }
24 23
25 mkdir -p -m0755 /var/run/sshd 24 mkdir -p -m0755 /var/run/sshd
26end script 25end script
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]
7EnvironmentFile=-/etc/default/ssh 7EnvironmentFile=-/etc/default/ssh
8ExecStartPre=/usr/bin/test -c /dev/null
9ExecStart=/usr/sbin/sshd -D $SSHD_OPTS 8ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
10ExecReload=/bin/kill -HUP $MAINPID 9ExecReload=/bin/kill -HUP $MAINPID
11KillMode=process 10KillMode=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]
6EnvironmentFile=-/etc/default/ssh 6EnvironmentFile=-/etc/default/ssh
7ExecStartPre=/usr/bin/test -c /dev/null
8ExecStart=-/usr/sbin/sshd -i $SSHD_OPTS 7ExecStart=-/usr/sbin/sshd -i $SSHD_OPTS
9StandardInput=socket 8StandardInput=socket