[PATCH] sshd-regen-keys: fix systemd service

[PATCH] sshd-regen-keys: fix systemd service

[Henning Schild]

From: Henning Schild <henning.schild@siemens.com>

In rare cases the service can leave sshd without keys. Turns out that
the service file to run "before" was wrong.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 .../sshd-regen-keys/files/sshd-regen-keys.service               | 2 +-
 .../{sshd-regen-keys_0.2.bb => sshd-regen-keys_0.3.bb}          | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/sshd-regen-keys/{sshd-regen-keys_0.2.bb => sshd-regen-keys_0.3.bb} (100%)

diff --git a/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.service b/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.service
index a05e1a98..f50d34c8 100644
--- a/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.service
+++ b/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.service
@@ -3,7 +3,7 @@ Description=Regenerate sshd host keys
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-remount-fs.service
-Before=shutdown.target sshd.service
+Before=shutdown.target ssh.service
 ConditionPathIsReadWrite=/etc
 
 [Service]
diff --git a/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.2.bb b/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.3.bb
similarity index 100%
rename from meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.2.bb
rename to meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.3.bb
-- 
2.24.1

Re: [PATCH] sshd-regen-keys: fix systemd service

[Henning Schild]

Please prefer the one from Cedric over this one, he is the one who
actually found it.

"[PATCH 1/3] sshd-regen-keys: correct dependency on ssh daemon service"

Henning

On Mon, 9 Mar 2020 14:03:15 +0100
Henning Schild <henning.schild@siemens.com> wrote:

> From: Henning Schild <henning.schild@siemens.com>
> 
> In rare cases the service can leave sshd without keys. Turns out that
> the service file to run "before" was wrong.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  .../sshd-regen-keys/files/sshd-regen-keys.service               | 2
> +- .../{sshd-regen-keys_0.2.bb => sshd-regen-keys_0.3.bb}          | 0
>  2 files changed, 1 insertion(+), 1 deletion(-)
>  rename meta/recipes-support/sshd-regen-keys/{sshd-regen-keys_0.2.bb
> => sshd-regen-keys_0.3.bb} (100%)
> 
> diff --git
> a/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.service
> b/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.service
> index a05e1a98..f50d34c8 100644 ---
> a/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.service
> +++
> b/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.service
> @@ -3,7 +3,7 @@ Description=Regenerate sshd host keys
> DefaultDependencies=no Conflicts=shutdown.target
> After=systemd-remount-fs.service -Before=shutdown.target sshd.service
> +Before=shutdown.target ssh.service ConditionPathIsReadWrite=/etc
>  
>  [Service]
> diff --git
> a/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.2.bb
> b/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.3.bb
> similarity index 100% rename from
> meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.2.bb rename to
> meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.3.bb