Eliminate unnecessary differences.

diff --git a/bookworm/setup_scripts/init_user_and_keybased_login.sh b/bookworm/setup_scripts/init_user_and_keybased_login.sh
index f2d83ee6a2d97cde6ceffb83fd741b93a2b83698..358a37e75f13536b5ee9c7e71b5eab350e09bc95 100755 (executable)
--- a/bookworm/setup_scripts/init_user_and_keybased_login.sh
+++ b/bookworm/setup_scripts/init_user_and_keybased_login.sh
@@ -48,4 +48,3 @@ sshpass -e ssh root@"${server}" \
         'mv /tmp/authorized_keys /home/plom/.ssh/'
 sshpass -e scp "${local_path_sshd_config}" root@"${server}":"${system_path_sshd_config}"
 sshpass -e ssh root@"${server}" 'service ssh restart'
-

diff --git a/bookworm/setup_scripts/init_user_login.sh b/bookworm/setup_scripts/init_user_login.sh
index f9733ff33f06e890762b77aafb064aa628cc61ec..3dfc0d550b6e819434ef5eaa2e56b97db8773381 100755 (executable)
--- a/bookworm/setup_scripts/init_user_login.sh
+++ b/bookworm/setup_scripts/init_user_login.sh
@@ -8,7 +8,7 @@
 # /etc/ssh/sshd_config.
 #
 # Dependencies: ssh, scp, ~/.ssh/id_rsa.pub, properly configured sshd_config
-# file in misc.sh:local_etc_server$
+# file in misc.sh:$local_etc_server.
 set -e
 . ./misc.sh
 . ../../misc.sh
@@ -37,4 +37,3 @@ ssh root@"${server}" 'chown plom:plom /home/plom/.ssh/authorized_keys'
 # Set up SSH config and remove direct SSH login to root.
 scp "${local_path_sshd_config}" root@"${server}":"${system_path_sshd_config}"
 ssh root@"${server}" 'rm -rf /root/.ssh && service ssh restart'
-

diff --git a/bullseye/setup_scripts/init_user_and_keybased_login.sh b/bullseye/setup_scripts/init_user_and_keybased_login.sh
index 544f3c60bdf70ebe5cd38fbc772a41cbb3f1af15..358a37e75f13536b5ee9c7e71b5eab350e09bc95 100755 (executable)
--- a/bullseye/setup_scripts/init_user_and_keybased_login.sh
+++ b/bullseye/setup_scripts/init_user_and_keybased_login.sh
@@ -21,7 +21,7 @@ ssh-keygen -f "/home/plom/.ssh/known_hosts" -R "${server}"
 
 # This will be used to log-in as root from plom account.
 printf '\nFirst, enter the old root password; then enter new password three times.\n\n'
-ssh root@"${server}" 'printf "\n" && passwd'
+ssh root@"${server}" 'printf "\n\n" && passwd'
 
 # Save root password for sshpass
 stty -echo

diff --git a/bullseye/setup_scripts/init_user_login.sh b/bullseye/setup_scripts/init_user_login.sh
index b63d0d8502d1072b5660bc032b0bec7dcf3c2d7b..3dfc0d550b6e819434ef5eaa2e56b97db8773381 100755 (executable)
--- a/bullseye/setup_scripts/init_user_login.sh
+++ b/bullseye/setup_scripts/init_user_login.sh
@@ -8,7 +8,7 @@
 # /etc/ssh/sshd_config.
 #
 # Dependencies: ssh, scp, ~/.ssh/id_rsa.pub, properly configured sshd_config
-# file in misc.sh:$linkable_files_dir
+# file in misc.sh:$local_etc_server.
 set -e
 . ./misc.sh
 . ../../misc.sh
@@ -24,8 +24,8 @@ eval $(ssh-agent)
 ssh-add
 
 # This will be used to log-in as root from plom account.
-echo 'Asking for new root password.'
-ssh root@"${server}" "passwd"
+printf '\nAsking for new root password.\n\n'
+ssh root@"${server}" 'printf "\n\n" && passwd'
 
 # Set up plom's ~/.ssh/authorized_keys from root's.
 ssh root@"${server}" 'useradd -m plom'