diff options
author | Colin Watson <cjwatson@debian.org> | 2018-06-16 12:43:40 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2018-06-16 12:49:09 +0100 |
commit | dff8e1983e7a4b850fb7b3fb5eb82836c351e347 (patch) | |
tree | 41fa69468a2235affacda79b6341493799403fe5 /debian | |
parent | d6c478e197da560a0d007964168ea6d7ac972b20 (diff) | |
parent | f6b4c68460920f9aafc75389c7c941584d4d06bb (diff) |
Merge branch 'gratuxri-guest/master'
Add rescue.target with ssh support
See merge request ssh-team/openssh!1
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 4 | ||||
-rwxr-xr-x | debian/openssh-server.install | 1 | ||||
-rw-r--r-- | debian/systemd/rescue-ssh.target | 6 |
3 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 3e3c33fba..5a180a84c 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,7 +1,11 @@ | |||
1 | openssh (1:7.7p1-3) UNRELEASED; urgency=medium | 1 | openssh (1:7.7p1-3) UNRELEASED; urgency=medium |
2 | 2 | ||
3 | [ Colin Watson ] | ||
3 | * Adjust git-dpm tagging configuration. | 4 | * Adjust git-dpm tagging configuration. |
4 | 5 | ||
6 | [ Juri Grabowski ] | ||
7 | * Add rescue.target with ssh support. | ||
8 | |||
5 | -- Colin Watson <cjwatson@debian.org> Sat, 16 Jun 2018 12:42:36 +0100 | 9 | -- Colin Watson <cjwatson@debian.org> Sat, 16 Jun 2018 12:42:36 +0100 |
6 | 10 | ||
7 | openssh (1:7.7p1-2) unstable; urgency=medium | 11 | openssh (1:7.7p1-2) unstable; urgency=medium |
diff --git a/debian/openssh-server.install b/debian/openssh-server.install index a2d8fed78..5ca921cca 100755 --- a/debian/openssh-server.install +++ b/debian/openssh-server.install | |||
@@ -11,6 +11,7 @@ debian/openssh-server.ucf-md5sum => usr/share/openssh/sshd_config.md5sum | |||
11 | debian/openssh-server.if-up => etc/network/if-up.d/openssh-server | 11 | debian/openssh-server.if-up => etc/network/if-up.d/openssh-server |
12 | debian/openssh-server.ufw.profile => etc/ufw/applications.d/openssh-server | 12 | debian/openssh-server.ufw.profile => etc/ufw/applications.d/openssh-server |
13 | debian/systemd/ssh.socket lib/systemd/system | 13 | debian/systemd/ssh.socket lib/systemd/system |
14 | debian/systemd/rescue-ssh.target lib/systemd/system | ||
14 | debian/systemd/ssh@.service lib/systemd/system | 15 | debian/systemd/ssh@.service lib/systemd/system |
15 | debian/systemd/ssh-session-cleanup usr/lib/openssh | 16 | debian/systemd/ssh-session-cleanup usr/lib/openssh |
16 | 17 | ||
diff --git a/debian/systemd/rescue-ssh.target b/debian/systemd/rescue-ssh.target new file mode 100644 index 000000000..9501b7fd0 --- /dev/null +++ b/debian/systemd/rescue-ssh.target | |||
@@ -0,0 +1,6 @@ | |||
1 | [Unit] | ||
2 | Description=Rescue with network and ssh | ||
3 | Documentation=man:systemd.special(7) | ||
4 | Requires=network-online.target ssh.service | ||
5 | After=network-online.target ssh.service | ||
6 | AllowIsolate=yes | ||