fix: fix recipes for Bookworm-based releases

silitics · Nov 17, 2023 · 11eb988 · 11eb988
1 parent 0ce8cd0
commit 11eb988
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/recipes/pi-cleanup/steps/00-install.sh b/recipes/pi-cleanup/steps/00-install.sh
@@ -5,8 +5,13 @@ set -euo pipefail
 export DEBIAN_FRONTEND=noninteractive
 
 systemctl disable userconfig
-systemctl disable unattended-upgrades.service
 systemctl disable resize2fs_once
 
+# Only exists on older (Debuan Buster) releases.
+systemctl disable unattended-upgrades.service || true
+
+# Only exists on newer (Debian Bookworm) releases.
+systemctl disable sshswitch.service || true
+
 apt-get purge -y userconf-pi
 rm -f /etc/ssh/sshd_config.d/rename_user.conf
diff --git a/recipes/ssh/files/hydrate-ssh-host-keys.service b/recipes/ssh/files/hydrate-ssh-host-keys.service
@@ -1,8 +1,6 @@
 [Unit]
 Description=Hydrate SSH Host Keys
 Before=ssh.service
-ConditionPathIsReadWrite=/run/rugpi/state/ssh
-ConditionFileIsExecutable=/usr/bin/ssh-keygen
 
 [Service]
 Type=oneshot