aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2021-07-22 14:29:35 +0200
committerSven Gothel <[email protected]>2021-07-22 14:29:35 +0200
commit3109247b830f11a214dad8fcec5c0a50cc7f5525 (patch)
tree573c4690839d2ce96061d34ef0296b04fc44306d
parent0ae1dca5a6a44229a9dcc520c702efba7a7a8570 (diff)
stage2 01-sys-tweak: Never use raspi only 'regenerate_ssh_host_keys'
-rwxr-xr-xstage2/01-sys-tweaks/01-run.sh13
1 files changed, 2 insertions, 11 deletions
diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh
index 4077172..7caf1e7 100755
--- a/stage2/01-sys-tweaks/01-run.sh
+++ b/stage2/01-sys-tweaks/01-run.sh
@@ -75,13 +75,8 @@ on_chroot << EOF
systemctl disable ssh
systemctl mask ssh
fi
- if [ "${ROOTFS_RO}" = "1" ] ; then
- systemctl disable regenerate_ssh_host_keys
- systemctl mask regenerate_ssh_host_keys
- else
- systemctl unmask regenerate_ssh_host_keys
- systemctl enable regenerate_ssh_host_keys
- fi
+ systemctl disable regenerate_ssh_host_keys
+ systemctl mask regenerate_ssh_host_keys
if [ "${ROOTFS_RO}" = "1" ] ; then
sed -i -e 's/^D \/tmp/#D \/tmp/g' /usr/lib/tmpfiles.d/tmp.conf
@@ -267,7 +262,3 @@ on_chroot <<EOF
fi
EOF
-if [ "${ROOTFS_RO}" != "1" ] ; then
- rm -f "${ROOTFS_DIR}/etc/ssh/"ssh_host_*_key*
-fi
-