fix OpenSSH service waiting for timeout

Patch for https://github.com/gsauthof/dracut-sshd/issues/2
This commit is contained in:
Florian Tham
2020-11-15 11:30:54 +01:00
parent 393ea8de23
commit 07e2c5d7a1
3 changed files with 24 additions and 1 deletions

View File

@@ -1 +1,2 @@
EBUILD dracut-sshd-9999.ebuild 486 BLAKE2B 2f4715cfac1a6e680334f7637895453569d0f4be9f8b6b8e48f28d54c6460e93dd81b6db05f28104328f8340e81d1cb9bd67c3ba58cf52bf2523924ea1dcc225 SHA512 33437a308eb372948b7da77100db3d595a55ec31cc4dfa3e5c178a6a003b3e2a4f8f95a1016081b95395710f18953ad343c4ff26e16e8f00d0f8d5c90ff61d2c
AUX gentoo-sshd.service.patch 742 BLAKE2B d4271e9280d97d60717dd8b934e55ac8b8d716bd439b36726ba33c8686c76368701edfa3086238d72bcc1b541ea90d7ddd01b973a2f076e4ac0e9e8788119b19 SHA512 be10794d77c7b47f46aa0033f2990504b7638be8eeec6ff1983b91fa71b2cdc070f48c10432bb34f21eeabfb9d9f66437006dd47fd7973bc209758dbe27787b6
EBUILD dracut-sshd-9999.ebuild 539 BLAKE2B c533f0fb66bad09a907e9b767944e518d5d6cf4fee81ce8b9dc99a9a4b96e19a24f6e31ee97f931b7b229bdffe3502c30c4a1249fbd24af352a84c594707ddf8 SHA512 bc49a85133677791fa162a0c18567fcf2542b2534f95ac66e219773eaf2b68c7a84a28385b86e1a5c97c355470efabbe9e31a6f39644bddf9dfe0b422717f123

View File

@@ -18,6 +18,8 @@ IUSE=""
DEPEND="sys-kernel/dracut"
RDEPEND="${DEPEND}"
PATCHES=( "${FILESDIR}/gentoo-sshd.service.patch" )
src_install () {
insinto /usr/lib/dracut/modules.d
doins -r 46sshd

View File

@@ -0,0 +1,20 @@
--- a/46sshd/sshd.service 2020-11-15 11:18:05.875510770 +0100
+++ b/46sshd/sshd.service 2020-11-15 11:18:58.253009836 +0100
@@ -11,7 +11,7 @@
#
# On distributions such as Gentoo, sshd doesn't come with
# systemd support, thus, one has to set `Type=simple` there.
-Type=notify
+Type=simple
EnvironmentFile=-/etc/crypto-policies/back-ends/opensshserver.config
EnvironmentFile=-/etc/crypto-policies/back-ends/openssh-server.config
@@ -21,7 +21,7 @@
# Start command requires the `-e` option if and only if `Type=simple`
# is configured, see above.
-ExecStart=/usr/sbin/sshd -D $SSHD_OPTS $OPTIONS $CRYPTO_POLICY
+ExecStart=/usr/sbin/sshd -D -e $SSHD_OPTS $OPTIONS $CRYPTO_POLICY
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process