summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/README.Debian4
-rw-r--r--debian/changelog3
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/README.Debian b/debian/README.Debian
index ff15f6d07..6e6bf9dc8 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -198,8 +198,8 @@ stop'), add the following line to /etc/inittab, and run 'telinit q':
198 ss:2345:respawn:/usr/sbin/sshd -D 198 ss:2345:respawn:/usr/sbin/sshd -D
199 199
200If you do this, note that you will need to stop sshd being started in the 200If you do this, note that you will need to stop sshd being started in the
201normal way ('rm -f /etc/rc[2345].d/S16ssh') and that you will need to 201normal way ('update-rc.d ssh disable') and that you will need to restart
202restart this sshd manually on upgrades. 202this sshd manually on upgrades.
203 203
204Per-connection sshd instances with systemd 204Per-connection sshd instances with systemd
205------------------------------------------ 205------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 64742a3b3..eb335d68f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ openssh (1:6.5p1-4) UNRELEASED; urgency=medium
2 2
3 * Configure --without-hardening on hppa, to work around 3 * Configure --without-hardening on hppa, to work around
4 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155 (closes: #738798). 4 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155 (closes: #738798).
5 * Amend "Running sshd from inittab" instructions in README.Debian to
6 recommend 'update-rc.d ssh disable', rather than manual removal of rc*.d
7 symlinks that won't work with dependency-based sysv-rc.
5 8
6 -- Colin Watson <cjwatson@debian.org> Thu, 13 Feb 2014 10:53:22 +0000 9 -- Colin Watson <cjwatson@debian.org> Thu, 13 Feb 2014 10:53:22 +0000
7 10