forked from mirrored-repos/manjaro-tools
Merge branch 'robin0800-patch' into 'master'
patch to add user_shell to -qv argument See merge request tools/development-tools/manjaro-tools!314
This commit is contained in:
commit
181675fe0e
2 changed files with 4 additions and 0 deletions
|
@ -44,6 +44,7 @@ show_profile(){
|
|||
msg2 "hostname: %s" "${hostname}"
|
||||
msg2 "username: %s" "${username}"
|
||||
msg2 "password: %s" "${password}"
|
||||
msg2 "user_shell: %s" "${user_shell}"
|
||||
msg2 "login_shell: %s" "${login_shell}"
|
||||
msg2 "addgroups: %s" "${addgroups}"
|
||||
[[ -n ${smb_workgroup} ]] && msg2 "smb_workgroup: %s" "${smb_workgroup}"
|
||||
|
|
|
@ -420,6 +420,8 @@ load_profile_config(){
|
|||
|
||||
[[ -z ${password} ]] && password="manjaro"
|
||||
|
||||
[[ -z ${user_shell} ]] && user_shell='/bin/bash'
|
||||
|
||||
[[ -z ${login_shell} ]] && login_shell='/bin/bash'
|
||||
|
||||
if [[ -z ${addgroups} ]]; then
|
||||
|
@ -505,6 +507,7 @@ reset_profile(){
|
|||
unset disable_systemd_live
|
||||
unset packages_desktop
|
||||
unset packages_mhwd
|
||||
unset user_shell
|
||||
unset login_shell
|
||||
unset netinstall
|
||||
unset chrootcfg
|
||||
|
|
Loading…
Reference in a new issue