|
|
|
@ -551,10 +551,10 @@ exec_06_useradd(){
|
|
|
|
# -----------
|
|
|
|
# -----------
|
|
|
|
# Вызов как исполнителя после ubconfig
|
|
|
|
# Вызов как исполнителя после ubconfig
|
|
|
|
if [[ -n ${PARAM} && -z ${ROOTFS} ]]; then
|
|
|
|
if [[ -n ${PARAM} && -z ${ROOTFS} ]]; then
|
|
|
|
# # Добавим пользователя в дополнительные группы
|
|
|
|
# Добавим пользователя в дополнительные группы
|
|
|
|
# exec_08_user_members "USERADD[${SELECT_USERNAME}]=${USERADD[${SELECT_USERNAME}]}"
|
|
|
|
exec_08_user_members "USERADD[${SELECT_USERNAME}]=${USERADD[${SELECT_USERNAME}]}"
|
|
|
|
# # Задаём параметры пароля пользователю /etc/shadow из USERSHADOW[user]
|
|
|
|
# Задаём параметры пароля пользователю /etc/shadow из USERSHADOW[user]
|
|
|
|
# [[ -n ${USERSHADOW[${SELECT_USERNAME}]} ]] && exec_07_usershadow "USERSHADOW[${SELECT_USERNAME}]=${USERSHADOW[${SELECT_USERNAME}]}"
|
|
|
|
[[ -n ${USERSHADOW[${SELECT_USERNAME}]} ]] && exec_07_usershadow "USERSHADOW[${SELECT_USERNAME}]=${USERSHADOW[${SELECT_USERNAME}]}"
|
|
|
|
# Добавить параметр в ${FILE_ROOT_USERS}=.users_credential и удалить хеш пароля параметра USERADD[.*] в /etc/ublinux/users
|
|
|
|
# Добавить параметр в ${FILE_ROOT_USERS}=.users_credential и удалить хеш пароля параметра USERADD[.*] в /etc/ublinux/users
|
|
|
|
if [[ -f ${FILE_ROOT_USERS} ]]; then
|
|
|
|
if [[ -f ${FILE_ROOT_USERS} ]]; then
|
|
|
|
sed "/USERADD\[${SELECT_USERNAME}\]=/d" -i "${FILE_ROOT_USERS}"
|
|
|
|
sed "/USERADD\[${SELECT_USERNAME}\]=/d" -i "${FILE_ROOT_USERS}"
|
|
|
|
@ -757,30 +757,31 @@ exec_08_user_members(){
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
# Autodetect firststart
|
|
|
|
# Autodetect DM_HINT_PASSWORD
|
|
|
|
# Если пароли по умолчанию, то firststart
|
|
|
|
# Если пароли по умолчанию, то DM_HINT_PASSWORD=yes
|
|
|
|
exec_99_firststart(){
|
|
|
|
exec_99_dm_hint_password(){
|
|
|
|
#echo "exec_99_firststart"
|
|
|
|
#echo "exec_99_dm_hint_password"
|
|
|
|
[[ $1 == @("set="|"set+="|"set++="|"set-="|"set--="|"remove") ]] && local COMMAND=$1 && shift
|
|
|
|
[[ $1 == @("set="|"set+="|"set++="|"set-="|"set--="|"remove") ]] && local COMMAND=$1 && shift
|
|
|
|
[[ -n ${COMMAND} ]] || local COMMAND="set="
|
|
|
|
[[ -n ${COMMAND} ]] || local COMMAND="set="
|
|
|
|
local PARAM="$@"
|
|
|
|
local PARAM="$@"
|
|
|
|
if [[ -n ${PARAM} ]]; then
|
|
|
|
if [[ -n ${PARAM} ]]; then
|
|
|
|
local FIRSTSTART=
|
|
|
|
local DM_HINT_PASSWORD=
|
|
|
|
[[ ${PARAM%%=*} =~ [!\$%\&()*+,/\;\<\=\>?\^\{|\}~] ]] || eval "${PARAM%%=*}=\${PARAM#*=}"
|
|
|
|
[[ ${PARAM%%=*} =~ [!\$%\&()*+,/\;\<\=\>?\^\{|\}~] ]] || eval "${PARAM%%=*}=\${PARAM#*=}"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if [[ -n ${ROOTFS} ]]; then
|
|
|
|
if [[ -n ${ROOTFS} ]]; then
|
|
|
|
if grep -q "^root:${DEFAULTROOTPASSWD}:" ${ROOTFS}/etc/shadow \
|
|
|
|
if grep -q "^root:${DEFAULTROOTPASSWD}:" ${ROOTFS}/etc/shadow \
|
|
|
|
&& grep -q "^$(grep ".*:x:${ADMUID}:" ${ROOTFS}/etc/passwd | cut -d: -f1):${DEFAULTPASSWD}:" ${ROOTFS}/etc/shadow; then
|
|
|
|
&& grep -q "^$(grep ".*:x:${ADMUID}:" ${ROOTFS}/etc/passwd | cut -d: -f1):${DEFAULTPASSWD}:" ${ROOTFS}/etc/shadow; then
|
|
|
|
grep -q "^FIRSTSTART$" ${SYSCONF}/config 2>/dev/null || echo "FIRSTSTART=yes" >> ${SYSCONF}/config
|
|
|
|
[[ $(cat ${SYSCONF}/config 2>/dev/null) =~ ($'\n'|^)+'DM_HINT_PASSWORD=' ]] || echo "DM_HINT_PASSWORD=yes" >> ${SYSCONF}/config
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
sed "/DM_HINT_PASSWORD=/d" -i ${SYSCONF}/config
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
elif [[ ${COMMAND} == @("set="|"set+="|"set++=") ]] && [[ -n ${FIRSTSTART} ]]; then
|
|
|
|
elif [[ ${COMMAND} == @("set="|"set+="|"set++=") ]] && [[ -n ${DM_HINT_PASSWORD} ]]; then
|
|
|
|
[[ $(cat ${SYSCONF}/config 2>/dev/null) =~ ($'\n'|^)+'FIRSTSTART=' ]] || echo "FIRSTSTART=yes" >> ${SYSCONF}/config
|
|
|
|
true
|
|
|
|
elif [[ ${COMMAND} == @("set-="|"set--="|"remove") ]]; then
|
|
|
|
elif [[ ${COMMAND} == @("set-="|"set--="|"remove") ]]; then
|
|
|
|
sed "/FIRSTSTART=/d" -i ${SYSCONF}/config
|
|
|
|
true
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
################
|
|
|
|
################
|
|
|
|
##### MAIN #####
|
|
|
|
##### MAIN #####
|
|
|
|
################
|
|
|
|
################
|
|
|
|
|
