Fix sed statement for the changes in sshd_config over the years.

Now 'root' can actually login using a password. Really fixes debian-pi#516.
diederikdehaas · Jan 10, 2020 · e586a73 · e586a73
1 parent 7bf3cd8
commit e586a73
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/scripts/etc/init.d/rcS b/scripts/etc/init.d/rcS
@@ -1040,7 +1040,8 @@ if [ ! "$disable_root" = "1" ]; then
         root_pw_ssh_hack_needed=$(is_change_in_release "2014-03-28" "$release")
         if [ "$root_pw_ssh_hack_needed" = "1" ] && [ -f /rootfs/etc/ssh/sshd_config ] ; then
             echo -n "  Allowing root to login with password on $release... "
-            sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /rootfs/etc/ssh/sshd_config || fail
+            sed -i -E 's/PermitRootLogin (without|prohibit)-password/PermitRootLogin yes/' /rootfs/etc/ssh/sshd_config || fail
+            sed -i 's/^#PermitRootLogin/PermitRootLogin/' /rootfs/etc/ssh/sshd_config || fail
             echo "OK"
         fi
         echo -n "  Setting root password... "