Merge branch 'gratuxri-guest/master'

Add rescue.target with ssh support

See merge request ssh-team/openssh!1

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 @@
 openssh (1:7.7p1-3) UNRELEASED; urgency=medium
 
+  [ Colin Watson ]
   * Adjust git-dpm tagging configuration.
 
+  [ Juri Grabowski ]
+  * Add rescue.target with ssh support.
+
  -- Colin Watson <cjwatson@debian.org>  Sat, 16 Jun 2018 12:42:36 +0100
 
 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
 debian/openssh-server.if-up => etc/network/if-up.d/openssh-server
 debian/openssh-server.ufw.profile => etc/ufw/applications.d/openssh-server
 debian/systemd/ssh.socket lib/systemd/system
+debian/systemd/rescue-ssh.target lib/systemd/system
 debian/systemd/ssh@.service lib/systemd/system
 debian/systemd/ssh-session-cleanup usr/lib/openssh
 
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 @@
+[Unit]
+Description=Rescue with network and ssh
+Documentation=man:systemd.special(7)
+Requires=network-online.target ssh.service
+After=network-online.target ssh.service
+AllowIsolate=yes