Commit eaec1f49 authored by udeved's avatar udeved

buildiso: rm smb_workgroup

parent 45769a70
......@@ -76,7 +76,6 @@ show_profile(){
msg2 "password: %s" "${password}"
msg2 "login_shell: %s" "${login_shell}"
msg2 "addgroups: %s" "${addgroups}"
[[ -n ${smb_workgroup} ]] && msg2 "smb_workgroup: %s" "${smb_workgroup}"
msg2 "enable_live: %s" "${enable_live[*]}"
if [[ ${initsys} == 'systemd' ]];then
......
......@@ -144,11 +144,6 @@ write_live_session_conf(){
echo '' >> ${conf}
echo '# live group membership' >> ${conf}
echo "addgroups='${addgroups}'" >> ${conf}
if [[ -n ${smb_workgroup} ]];then
echo '' >> ${conf}
echo '# samba workgroup' >> ${conf}
echo "smb_workgroup=${smb_workgroup}" >> ${conf}
fi
}
configure_system(){
......
......@@ -81,8 +81,6 @@ load_profile(){
netgroups="https://raw.githubusercontent.com/manjaro/calamares-netgroups/master"
[[ -z ${smb_workgroup} ]] && smb_workgroup=''
basic='true'
[[ -z ${extra} ]] && extra='false'
......
......@@ -215,11 +215,6 @@ write_postcfg_conf(){
echo "keyrings:" >> "$conf"
echo " - archlinux" >> "$conf"
echo " - manjaro" >> "$conf"
if [[ -n ${smb_workgroup} ]];then
echo "" >> "$conf"
echo "samba:" >> "$conf"
echo " - workgroup: ${smb_workgroup}" >> "$conf"
fi
}
write_umount_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