From 358f62be8a0a7781e65783fc0d5b47fa93b7fd35 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Jul 12 2019 21:20:56 +0000
Subject: As agreed with anaconda team, they will provide a environment file under /etc/sysconfig (#1722928)


See anaconda pull request for discussion:

https://github.com/rhinstaller/anaconda/pull/2042

---

diff --git a/sshd.service b/sshd.service
index 605eab1..8f3dbd6 100644
--- a/sshd.service
+++ b/sshd.service
@@ -7,6 +7,7 @@ Wants=sshd-keygen.target
 [Service]
 Type=notify
 EnvironmentFile=-/etc/crypto-policies/back-ends/opensshserver.config
+EnvironmentFile=-/etc/sysconfig/sshd-permitrootlogin
 EnvironmentFile=-/etc/sysconfig/sshd
 ExecStart=/usr/sbin/sshd -D $OPTIONS $CRYPTO_POLICY $PERMITROOTLOGIN
 ExecReload=/bin/kill -HUP $MAINPID
diff --git a/sshd@.service b/sshd@.service
index 9b8e012..e4fd7f4 100644
--- a/sshd@.service
+++ b/sshd@.service
@@ -6,6 +6,7 @@ After=sshd-keygen.target
 
 [Service]
 EnvironmentFile=-/etc/crypto-policies/back-ends/opensshserver.config
+EnvironmentFile=-/etc/sysconfig/sshd-permitrootlogin
 EnvironmentFile=-/etc/sysconfig/sshd
-ExecStart=-/usr/sbin/sshd -i $OPTIONS $CRYPTO_POLICY
+ExecStart=-/usr/sbin/sshd -i $OPTIONS $CRYPTO_POLICY $PERMITROOTLOGIN
 StandardInput=socket