diff options
author | Dimitri John Ledkov <xnox@ubuntu.com> | 2017-08-21 12:48:31 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2017-08-22 16:17:24 +0100 |
commit | b4fc0d329c03de1c38dc3f908a10f7239c32a05c (patch) | |
tree | 9187928083f825c0cdc32a2bfc0fd369a600ea38 /debian/openssh-server.ssh.init | |
parent | 0aa09c9ec85924a27d864ccf26bc1fed79b41946 (diff) |
Drop upstart system and user jobs.
Diffstat (limited to 'debian/openssh-server.ssh.init')
-rw-r--r-- | debian/openssh-server.ssh.init | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/debian/openssh-server.ssh.init b/debian/openssh-server.ssh.init index 70a6c38f2..f25000883 100644 --- a/debian/openssh-server.ssh.init +++ b/debian/openssh-server.ssh.init | |||
@@ -33,12 +33,6 @@ run_by_init() { | |||
33 | ([ "$previous" ] && [ "$runlevel" ]) || [ "$runlevel" = S ] | 33 | ([ "$previous" ] && [ "$runlevel" ]) || [ "$runlevel" = S ] |
34 | } | 34 | } |
35 | 35 | ||
36 | check_for_upstart() { | ||
37 | if init_is_upstart; then | ||
38 | exit $1 | ||
39 | fi | ||
40 | } | ||
41 | |||
42 | check_for_no_start() { | 36 | check_for_no_start() { |
43 | # forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists | 37 | # forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists |
44 | if [ -e /etc/ssh/sshd_not_to_be_run ]; then | 38 | if [ -e /etc/ssh/sshd_not_to_be_run ]; then |
@@ -82,7 +76,6 @@ export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" | |||
82 | 76 | ||
83 | case "$1" in | 77 | case "$1" in |
84 | start) | 78 | start) |
85 | check_for_upstart 1 | ||
86 | check_privsep_dir | 79 | check_privsep_dir |
87 | check_for_no_start | 80 | check_for_no_start |
88 | check_dev_null | 81 | check_dev_null |
@@ -94,7 +87,6 @@ case "$1" in | |||
94 | fi | 87 | fi |
95 | ;; | 88 | ;; |
96 | stop) | 89 | stop) |
97 | check_for_upstart 0 | ||
98 | log_daemon_msg "Stopping OpenBSD Secure Shell server" "sshd" || true | 90 | log_daemon_msg "Stopping OpenBSD Secure Shell server" "sshd" || true |
99 | if start-stop-daemon --stop --quiet --oknodo --pidfile /run/sshd.pid; then | 91 | if start-stop-daemon --stop --quiet --oknodo --pidfile /run/sshd.pid; then |
100 | log_end_msg 0 || true | 92 | log_end_msg 0 || true |
@@ -104,7 +96,6 @@ case "$1" in | |||
104 | ;; | 96 | ;; |
105 | 97 | ||
106 | reload|force-reload) | 98 | reload|force-reload) |
107 | check_for_upstart 1 | ||
108 | check_for_no_start | 99 | check_for_no_start |
109 | check_config | 100 | check_config |
110 | log_daemon_msg "Reloading OpenBSD Secure Shell server's configuration" "sshd" || true | 101 | log_daemon_msg "Reloading OpenBSD Secure Shell server's configuration" "sshd" || true |
@@ -116,7 +107,6 @@ case "$1" in | |||
116 | ;; | 107 | ;; |
117 | 108 | ||
118 | restart) | 109 | restart) |
119 | check_for_upstart 1 | ||
120 | check_privsep_dir | 110 | check_privsep_dir |
121 | check_config | 111 | check_config |
122 | log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true | 112 | log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true |
@@ -131,7 +121,6 @@ case "$1" in | |||
131 | ;; | 121 | ;; |
132 | 122 | ||
133 | try-restart) | 123 | try-restart) |
134 | check_for_upstart 1 | ||
135 | check_privsep_dir | 124 | check_privsep_dir |
136 | check_config | 125 | check_config |
137 | log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true | 126 | log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true |
@@ -162,7 +151,6 @@ case "$1" in | |||
162 | ;; | 151 | ;; |
163 | 152 | ||
164 | status) | 153 | status) |
165 | check_for_upstart 1 | ||
166 | status_of_proc -p /run/sshd.pid /usr/sbin/sshd sshd && exit 0 || exit $? | 154 | status_of_proc -p /run/sshd.pid /usr/sbin/sshd sshd && exit 0 || exit $? |
167 | ;; | 155 | ;; |
168 | 156 | ||