refact: ssh server start

Author: simonwalz

system/Dockerfile

@@ -71,7 +71,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   vim \
   && apt-get clean && rm -rf /var/lib/apt/lists/* \
   && systemctl enable systemd-timesyncd.service \
-  && systemctl disable ssh.socket ssh.service sshd.service \
   && systemctl mask ssh.socket \
   && echo "Port 4222\nPermitRootLogin yes" >/etc/ssh/sshd_config.d/cuos.conf \
   && rm -f /etc/ssh/ssh_host_* \

system/Dockerfile.lxc

@@ -50,7 +50,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   vim \
   && apt-get clean && rm -rf /var/lib/apt/lists/* \
   # No timesyncd for LXC \
-  && systemctl disable ssh.socket ssh.service sshd.service \
   && systemctl mask ssh.socket \
   && echo "Port 4222\nPermitRootLogin yes" >/etc/ssh/sshd_config.d/cuos.conf \
   && rm -f /etc/ssh/ssh_host_* \

system/Dockerfile.rpi-arm64

@@ -125,7 +125,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   vim \
   && apt-get clean && rm -rf /var/lib/apt/lists/* \
   && systemctl enable systemd-timesyncd.service \
-  && systemctl disable ssh.socket ssh.service sshd.service \
   && systemctl mask ssh.socket \
   && echo "Port 4222\nPermitRootLogin yes" >/etc/ssh/sshd_config.d/cuos.conf \
   && rm -f /etc/ssh/ssh_host_* \

system/cuos/init.sh

@@ -424,14 +424,19 @@ configure_ssh_server() {
   local ssh_enabled
   ssh_enabled="$(jq_config -r '.os_ssh_server // false')"
 
+  local ssh_enabled_before="true"
+  [[ -f "/etc/ssh/sshd_not_to_be_run" ]] && ssh_enabled_before="false"
   if [[ "${ssh_enabled}" == "true" ]]; then
     report_info "cuos:init:ssh_server" "Start SSH server"
-    systemctl enable ssh.service 2>/dev/null || true
+    rm /etc/ssh/sshd_not_to_be_run
     iptables -I INPUT -p tcp --dport 4222 -j ACCEPT 2>/dev/null || true
   else
-    systemctl disable ssh.service 2>/dev/null || true
+    touch /etc/ssh/sshd_not_to_be_run
     iptables -D INPUT -p tcp --dport 4222 -j ACCEPT 2>/dev/null || true
   fi
+  if [[ -n "${REINIT:-}" && "${ssh_enabled}" != "${ssh_enabled_before}" ]]; then
+    systemctl restart ssh.service
+  fi
 }
 
 configure_docker() {