Commit d6ab170f authored by Philip Müller's avatar Philip Müller

Merge branch 'stable-0.15.x' into 'stable-0.15.x'

[lib] write user_shell from profile if exist

See merge request !296
parents 72f46f8a 70f036cb
......@@ -43,6 +43,12 @@
# the same workgroup name if samba is used
# smb_workgroup="Manjaro"
# default system shell is bash
# '/etc/defaults/useradd': " "
# userShell : "/bin/zsh"
# empty value will not be used
#user_shell=
################# live-session #################
# unset defaults to given value
......
......@@ -148,6 +148,9 @@ write_users_conf(){
echo "doReusePassword: false" >> "$conf" # only used in old 'users' module
echo "availableShells: /bin/bash, /bin/zsh" >> "$conf" # only used in new 'users' module
echo "avatarFilePath: ~/.face" >> "$conf" # mostly used file-name for avatar
if [[ -n "$user_shell" ]]; then
echo "userShell: $user_shell" >> "$conf"
fi
}
write_packages_conf(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment