diff --git a/bin/buildiso.in b/bin/buildiso.in index f6a4d12..c696a9d 100755 --- a/bin/buildiso.in +++ b/bin/buildiso.in @@ -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 diff --git a/lib/util-iso-chroot.sh b/lib/util-iso-chroot.sh index c021a46..4341449 100644 --- a/lib/util-iso-chroot.sh +++ b/lib/util-iso-chroot.sh @@ -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(){ diff --git a/lib/util-profile.sh b/lib/util-profile.sh index 404c6f9..047ea4e 100644 --- a/lib/util-profile.sh +++ b/lib/util-profile.sh @@ -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' diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh index c95421d..a0ffcfd 100644 --- a/lib/util-yaml.sh +++ b/lib/util-yaml.sh @@ -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(){