diff options
author | Colin Watson <cjwatson@debian.org> | 2012-11-26 16:31:08 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-11-26 16:31:08 +0000 |
commit | 2c3850b2193fa51b4a8d0b55f38b951917022b5c (patch) | |
tree | c2f5c171be25515359f6a7d6d428565e38abc605 /debian | |
parent | 7a429f23d389f21d7f98737e6f641442c794226e (diff) |
Tweak sshd(8) to refer to ssh's Upstart job as well as its init script.
Diffstat (limited to 'debian')
-rw-r--r-- | debian/patches/doc-upstart.patch | 21 | ||||
-rw-r--r-- | debian/patches/series | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/debian/patches/doc-upstart.patch b/debian/patches/doc-upstart.patch new file mode 100644 index 000000000..5f35ac0c8 --- /dev/null +++ b/debian/patches/doc-upstart.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | Description: Refer to ssh's Upstart job as well as its init script | ||
2 | Author: Colin Watson <cjwatson@ubuntu.com> | ||
3 | Forwarded: not-needed | ||
4 | Last-Update: 2012-11-26 | ||
5 | |||
6 | Index: b/sshd.8 | ||
7 | =================================================================== | ||
8 | --- a/sshd.8 | ||
9 | +++ b/sshd.8 | ||
10 | @@ -69,7 +69,10 @@ | ||
11 | .Nm | ||
12 | listens for connections from clients. | ||
13 | It is normally started at boot from | ||
14 | -.Pa /etc/init.d/ssh . | ||
15 | +.Pa /etc/init.d/ssh | ||
16 | +(or | ||
17 | +.Pa /etc/init/ssh.conf | ||
18 | +on systems using the Upstart init daemon). | ||
19 | It forks a new | ||
20 | daemon for each incoming connection. | ||
21 | The forked daemons handle | ||
diff --git a/debian/patches/series b/debian/patches/series index c5cf8de4b..c940d8384 100644 --- a/debian/patches/series +++ b/debian/patches/series | |||
@@ -39,6 +39,7 @@ lintian-symlink-pickiness.patch | |||
39 | openbsd-docs.patch | 39 | openbsd-docs.patch |
40 | ssh-argv0.patch | 40 | ssh-argv0.patch |
41 | doc-hash-tab-completion.patch | 41 | doc-hash-tab-completion.patch |
42 | doc-upstart.patch | ||
42 | 43 | ||
43 | # Debian-specific configuration | 44 | # Debian-specific configuration |
44 | gnome-ssh-askpass2-icon.patch | 45 | gnome-ssh-askpass2-icon.patch |