build-it.sh: always copy required config, post-build.sh: enable ssh root login

Author: mario-fink

build-it.sh

@@ -98,11 +98,11 @@ ls -lh reswarmos-build/
 logging_message "copy required configuration file"
 
 if [[ -f ${cfgfile} ]]; then
-  if [[ -f ./reswarmos-build/buildroot/.config ]]; then
-    echo "buildroot configuration .config already present: remove it to employ a new one"
-  else
-    cp -v ${cfgfile} ./reswarmos-build/buildroot/.config
-  fi
+#  if [[ -f ./reswarmos-build/buildroot/.config ]]; then
+#    echo "buildroot configuration .config already present: remove it to employ a new one"
+#  else
+  cp -v ${cfgfile} ./reswarmos-build/buildroot/.config
+#  fi
 else
   echo "sorry, the required config file '${cfgfile}' does not exist!" >&2
   exit 1

configs/raspberrypi4/post-build.sh

@@ -44,7 +44,12 @@ chmod 644 ${TARGET_DIR}/etc/profile.d/motd.sh
 cp -v ${ASSCNF}/shell-prompt.sh ${TARGET_DIR}/etc/profile.d/shell-prompt.sh
 chmod 644 ${TARGET_DIR}/etc/profile.d/shell-prompt.sh
 # evtl. allow root login
-echo "PermitRootLogin yes" >> ${TARGET_DIR}/etc/ssh/ssh_config
+sshdopt="PermitRootLogin yes"
+sshdpath="${TARGET_DIR}/etc/ssh/sshd_config"
+sshdoptch=$(cat ${sshdpath} | grep -v "^#" | grep "${sshdopt}")
+if [ -z "${sshdoptch}" ]; then
+  echo "${sshdopt}" >> ${sshdpath}
+fi
 
 # copy default device to boot partition
 cp -v ${DEVCNF}/device-config.ini ${BINARIES_DIR}/device-config.ini