forked from mirrored-repos/manjaro-tools
Merge branch 'master' into gnome-initial-setup
This commit is contained in:
commit
28db47e276
3 changed files with 8 additions and 4 deletions
|
@ -44,6 +44,7 @@ show_profile(){
|
||||||
msg2 "hostname: %s" "${hostname}"
|
msg2 "hostname: %s" "${hostname}"
|
||||||
msg2 "username: %s" "${username}"
|
msg2 "username: %s" "${username}"
|
||||||
msg2 "password: %s" "${password}"
|
msg2 "password: %s" "${password}"
|
||||||
|
msg2 "user_shell: %s" "${user_shell}"
|
||||||
msg2 "login_shell: %s" "${login_shell}"
|
msg2 "login_shell: %s" "${login_shell}"
|
||||||
msg2 "addgroups: %s" "${addgroups}"
|
msg2 "addgroups: %s" "${addgroups}"
|
||||||
[[ -n ${smb_workgroup} ]] && msg2 "smb_workgroup: %s" "${smb_workgroup}"
|
[[ -n ${smb_workgroup} ]] && msg2 "smb_workgroup: %s" "${smb_workgroup}"
|
||||||
|
|
|
@ -264,18 +264,18 @@ configure_journald(){
|
||||||
|
|
||||||
disable_srv_live(){
|
disable_srv_live(){
|
||||||
for srv in ${disable_systemd_live[@]}; do
|
for srv in ${disable_systemd_live[@]}; do
|
||||||
enable_systemd=(${enable_systemd[@]//*$srv*})
|
enable_systemd_both=(${enable_systemd[@]//*$srv*})
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
configure_services(){
|
configure_services_live(){
|
||||||
info "Configuring services"
|
info "Configuring services"
|
||||||
use_apparmor="false"
|
use_apparmor="false"
|
||||||
apparmor_boot_args=""
|
apparmor_boot_args=""
|
||||||
|
|
||||||
[[ ! -z $disable_systemd_live ]] && disable_srv_live
|
[[ ! -z $disable_systemd_live ]] && disable_srv_live
|
||||||
|
|
||||||
for svc in ${enable_systemd[@]}; do
|
for svc in ${enable_systemd_both[@]}; do
|
||||||
add_svc_sd "$1" "$svc"
|
add_svc_sd "$1" "$svc"
|
||||||
[[ "$svc" == "apparmor" ]] && use_apparmor="true"
|
[[ "$svc" == "apparmor" ]] && use_apparmor="true"
|
||||||
done
|
done
|
||||||
|
@ -364,7 +364,7 @@ configure_live_image(){
|
||||||
msg "Configuring [livefs]"
|
msg "Configuring [livefs]"
|
||||||
configure_hosts "$1"
|
configure_hosts "$1"
|
||||||
configure_system "$1"
|
configure_system "$1"
|
||||||
configure_services "$1"
|
configure_services_live "$1"
|
||||||
configure_calamares "$1"
|
configure_calamares "$1"
|
||||||
# [[ ${edition} == "sonar" ]] && configure_thus "$1"
|
# [[ ${edition} == "sonar" ]] && configure_thus "$1"
|
||||||
write_live_session_conf "$1"
|
write_live_session_conf "$1"
|
||||||
|
|
|
@ -420,6 +420,8 @@ load_profile_config(){
|
||||||
|
|
||||||
[[ -z ${password} ]] && password="manjaro"
|
[[ -z ${password} ]] && password="manjaro"
|
||||||
|
|
||||||
|
[[ -z ${user_shell} ]] && user_shell='/bin/bash'
|
||||||
|
|
||||||
[[ -z ${login_shell} ]] && login_shell='/bin/bash'
|
[[ -z ${login_shell} ]] && login_shell='/bin/bash'
|
||||||
|
|
||||||
if [[ -z ${addgroups} ]]; then
|
if [[ -z ${addgroups} ]]; then
|
||||||
|
@ -505,6 +507,7 @@ reset_profile(){
|
||||||
unset disable_systemd_live
|
unset disable_systemd_live
|
||||||
unset packages_desktop
|
unset packages_desktop
|
||||||
unset packages_mhwd
|
unset packages_mhwd
|
||||||
|
unset user_shell
|
||||||
unset login_shell
|
unset login_shell
|
||||||
unset netinstall
|
unset netinstall
|
||||||
unset chrootcfg
|
unset chrootcfg
|
||||||
|
|
Loading…
Reference in a new issue