mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
firstlogin: quote values if space is legal (#6942)
This commit is contained in:
@@ -528,10 +528,10 @@ add_user() {
|
||||
REPEATS=3
|
||||
while [ -f "/root/.not_logged_in_yet" ]; do
|
||||
echo -e "\nPlease provide a username (eg. your first name): \c"
|
||||
if [ -z $PRESET_USER_NAME ];then
|
||||
if [ -z "$PRESET_USER_NAME" ];then
|
||||
read -r -e username
|
||||
else
|
||||
username=$PRESET_USER_NAME
|
||||
username="$PRESET_USER_NAME"
|
||||
fi
|
||||
if ! grep '^[a-zA-Z][a-zA-Z0-9]*$' <<< "$username" > /dev/null; then
|
||||
echo -e "\n\x1B[91mError\x1B[0m: illegal characters in username"
|
||||
@@ -544,17 +544,17 @@ add_user() {
|
||||
done
|
||||
|
||||
while [ -f "/root/.not_logged_in_yet" ]; do
|
||||
if [ -z $PRESET_USER_PASSWORD ];then
|
||||
if [ -z "$PRESET_USER_PASSWORD" ];then
|
||||
read_password "Create user ($username)"
|
||||
else
|
||||
password=$PRESET_USER_PASSWORD
|
||||
password="$PRESET_USER_PASSWORD"
|
||||
fi
|
||||
first_input="$password"
|
||||
echo ""
|
||||
if [ -z $PRESET_USER_PASSWORD ];then
|
||||
if [ -z "$PRESET_USER_PASSWORD" ];then
|
||||
read_password "Repeat user ($username)"
|
||||
else
|
||||
password=$PRESET_USER_PASSWORD
|
||||
password="$PRESET_USER_PASSWORD"
|
||||
fi
|
||||
second_input="$password"
|
||||
echo ""
|
||||
@@ -568,10 +568,10 @@ add_user() {
|
||||
fi
|
||||
fi
|
||||
echo -e ""
|
||||
if [ -z $PRESET_DEFAULT_REALNAME ];then
|
||||
if [ -z "$PRESET_DEFAULT_REALNAME" ];then
|
||||
read -r -e -p "Please provide your real name: " -i "${RealUserName^}" RealName
|
||||
else
|
||||
RealName=$PRESET_DEFAULT_REALNAME
|
||||
RealName="$PRESET_DEFAULT_REALNAME"
|
||||
fi
|
||||
|
||||
adduser --quiet --disabled-password --home /home/"$RealUserName" --gecos "$RealName" "$RealUserName"
|
||||
@@ -665,13 +665,13 @@ if [[ -f /root/.not_logged_in_yet && -n $(tty) ]]; then
|
||||
REPEATS=3
|
||||
while [ -f "/root/.not_logged_in_yet" ]; do
|
||||
. /root/.not_logged_in_yet
|
||||
if [ -z $PRESET_ROOT_PASSWORD ];then
|
||||
if [ -z "$PRESET_ROOT_PASSWORD" ];then
|
||||
read_password "Create root"
|
||||
else
|
||||
if [ "$(who am i | awk '{print $2}')" != "tty1" ];then
|
||||
exit
|
||||
fi
|
||||
password=$PRESET_ROOT_PASSWORD
|
||||
password="$PRESET_ROOT_PASSWORD"
|
||||
fi
|
||||
|
||||
# only allow one login. Once you enter root password, kill others.
|
||||
@@ -680,10 +680,10 @@ if [[ -f /root/.not_logged_in_yet && -n $(tty) ]]; then
|
||||
|
||||
first_input="$password"
|
||||
echo ""
|
||||
if [ -z $PRESET_ROOT_PASSWORD ];then
|
||||
if [ -z "$PRESET_ROOT_PASSWORD" ];then
|
||||
read_password "Repeat root"
|
||||
else
|
||||
password=$PRESET_ROOT_PASSWORD
|
||||
password="$PRESET_ROOT_PASSWORD"
|
||||
fi
|
||||
second_input="$password"
|
||||
echo ""
|
||||
|
||||
Reference in New Issue
Block a user