Pass the appropiate -R options to login, and -p.

Only print a preceeding newline if this is a retry.

1 files changed, 6 insertions, 4 deletions

diff --git a/utils/loginpr.sh b/utils/loginpr.sh
index 230cce2a..59924082 100644
--- a/utils/loginpr.sh
+++ b/utils/loginpr.sh
@@ -6,13 +6,15 @@
 # pseudo-user `login'.
 #
 
-prompt='
-login: '
+prompt='login: '
 user=''
 
-while [ ! "$user" ]; do
+test "$_LOGIN_RETRY" && echo ''
+unset _LOGIN_RETRY
+
+until [ "$user" ]; do
   echo -n "$prompt"
   read user args || exit 0
 done
 
-exec login "$@" --paranoid --retry="$0" "$user" $args
+exec login "$@" -p --paranoid -R-aSHELL="$0" -R-aMOTD -R-p -R-e_LOGIN_RETRY=yes "$user" $args