summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/openssh-server.dirs1
-rw-r--r--debian/openssh-server.if-up30
-rwxr-xr-xdebian/rules1
4 files changed, 34 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 7a9dcc970..95a7c741b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ openssh (1:4.6p1-2) UNRELEASED; urgency=low
10 * Document the SILENT loglevel in sftp-server(8), ssh_config(5), and 10 * Document the SILENT loglevel in sftp-server(8), ssh_config(5), and
11 sshd_config(5). 11 sshd_config(5).
12 * Add try-restart action to init script. 12 * Add try-restart action to init script.
13 * Add /etc/network/if-up.d/openssh-server to restart sshd when new
14 interfaces appear (LP: #103436).
13 15
14 -- Colin Watson <cjwatson@debian.org> Wed, 13 Jun 2007 00:56:45 +0100 16 -- Colin Watson <cjwatson@debian.org> Wed, 13 Jun 2007 00:56:45 +0100
15 17
diff --git a/debian/openssh-server.dirs b/debian/openssh-server.dirs
index b28faf929..7cc4c0d84 100644
--- a/debian/openssh-server.dirs
+++ b/debian/openssh-server.dirs
@@ -1,5 +1,6 @@
1etc/init.d 1etc/init.d
2etc/default 2etc/default
3etc/network/if-up.d
3usr/lib/openssh 4usr/lib/openssh
4usr/sbin 5usr/sbin
5usr/share/man/man5 6usr/share/man/man5
diff --git a/debian/openssh-server.if-up b/debian/openssh-server.if-up
new file mode 100644
index 000000000..67f06c094
--- /dev/null
+++ b/debian/openssh-server.if-up
@@ -0,0 +1,30 @@
1#! /bin/sh
2# Reload the OpenSSH server when an interface comes up, to allow it to start
3# listening on new addresses.
4
5set -e
6
7# Don't bother to restart sshd when lo is configured.
8if [ "$IFACE" = lo ]; then
9 exit 0
10fi
11
12# Only run from ifup.
13if [ "$MODE" != start ]; then
14 exit 0
15fi
16
17# OpenSSH only cares about inet and inet6. Get thee gone, strange people
18# still using ipx.
19if [ "$ADDRFAM" != inet ] && [ "$ADDRFAM" != inet6 ]; then
20 exit 0
21fi
22
23# Is /usr mounted?
24if [ ! -e /usr/sbin/sshd ]; then
25 exit 0
26fi
27
28/etc/init.d/ssh reload >/dev/null 2>&1
29
30exit 0
diff --git a/debian/rules b/debian/rules
index 6e335cf6e..71e291b7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -171,6 +171,7 @@ install: build
171 171
172 install -o root -g root debian/openssh-server.init debian/openssh-server/etc/init.d/ssh 172 install -o root -g root debian/openssh-server.init debian/openssh-server/etc/init.d/ssh
173 install -o root -g root -m 644 debian/openssh-server.default debian/openssh-server/etc/default/ssh 173 install -o root -g root -m 644 debian/openssh-server.default debian/openssh-server/etc/default/ssh
174 install -o root -g root debian/openssh-server.if-up debian/openssh-server/etc/network/if-up.d/openssh-server
174 175
175 install -m 755 build-udeb/ssh debian/openssh-client-udeb/usr/bin/ssh 176 install -m 755 build-udeb/ssh debian/openssh-client-udeb/usr/bin/ssh
176 install -m 755 build-udeb/scp debian/openssh-client-udeb/usr/bin/scp 177 install -m 755 build-udeb/scp debian/openssh-client-udeb/usr/bin/scp