From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 1 May 2012 12:36:23 +0000 (+0200)
Subject: openssh: Fix systemd service files.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eccf0dae38f0a6dce1ac7320e5b6a2dedcc9323b;p=ipfire-3.x.git

openssh: Fix systemd service files.

OpenSSH had problems with starting the daemon after installation.
This is now fixed.
---

diff --git a/openssh/openssh.nm b/openssh/openssh.nm
index d04d2b24d..b2b90e4b7 100644
--- a/openssh/openssh.nm
+++ b/openssh/openssh.nm
@@ -5,7 +5,7 @@
 
 name       = openssh
 version    = 5.9p1
-release    = 4
+release    = 5
 
 groups     = Application/Internet
 url        = http://www.openssh.com/portable.html
@@ -122,7 +122,7 @@ packages
 		end
 
 		script prein
-			getent group sshd_keys >/dev/null || groupadd -r ssh_keys || :
+			getent group ssh_keys >/dev/null || groupadd -r ssh_keys
 		end
 	end
 
@@ -203,9 +203,7 @@ packages
 
 		script preun
 			/bin/systemctl --no-reload disable sshd.service >/dev/null 2>&1 || :
-			/bin/systemctl --no-reload disable sshd-keygen.service >/dev/null 2>&1 || :
 			/bin/systemctl stop sshd.service >/dev/null 2>&1 || :
-			/bin/systemctl stop sshd-keygen.service >/dev/null 2>&1 || :
 		end
 
 		script postun
diff --git a/openssh/systemd/sshd-keygen.service b/openssh/systemd/sshd-keygen.service
index bfef3289f..1554c242f 100644
--- a/openssh/systemd/sshd-keygen.service
+++ b/openssh/systemd/sshd-keygen.service
@@ -2,11 +2,9 @@
 Description=SSH server keys generation.
 After=syslog.target
 Before=sshd.service
+BindTo=sshd.service
 
 [Service]
 Type=oneshot
 ExecStart=/usr/sbin/sshd-keygen
 RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openssh/systemd/sshd.service b/openssh/systemd/sshd.service
index 6b90aa165..9007d8967 100644
--- a/openssh/systemd/sshd.service
+++ b/openssh/systemd/sshd.service
@@ -3,7 +3,8 @@ Description=OpenSSH server daemon
 After=syslog.target network.target auditd.service
 
 [Service]
-ExecStart=/usr/sbin/sshd -D $OPTIONS
+ExecStartPre=/usr/sbin/sshd-keygen
+ExecStart=/usr/sbin/sshd -D
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/openssh/systemd/sshd.socket b/openssh/systemd/sshd.socket
deleted file mode 100644
index 94b953318..000000000
--- a/openssh/systemd/sshd.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=OpenSSH Server Socket
-Conflicts=sshd.service
-
-[Socket]
-ListenStream=22
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/openssh/systemd/sshd@.service b/openssh/systemd/sshd@.service
deleted file mode 100644
index 09f995e77..000000000
--- a/openssh/systemd/sshd@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=OpenSSH per-connection server daemon
-After=syslog.target auditd.service
-
-[Service]
-EnvironmentFile=/etc/sysconfig/sshd
-ExecStart=-/usr/sbin/sshd -i $OPTIONS
-StandardInput=socket