Compare commits

...

4 Commits

4 changed files with 14 additions and 22 deletions

View File

@@ -161,12 +161,12 @@ done
shift $(($OPTIND - 1))
${pretend} && display_settings && exit 1
check_root
prepare_traps
prepare_build
${pretend} && display_settings && exit 1
build

View File

@@ -60,7 +60,7 @@ load_profile(){
[[ -z ${PASSWORD} ]] && PASSWORD="artix"
if [[ -z ${ADDGROUPS} ]];then
ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"
ADDGROUPS="video,power,cdrom,network,lp,scanner,wheel,users,log"
fi
if [[ -z ${SERVICES[@]} ]];then
@@ -82,23 +82,14 @@ load_profile(){
}
write_live_session_conf(){
local path=$1${SYSCONFDIR}
[[ ! -d $path ]] && mkdir -p "$path"
local conf=$path/live.conf
msg2 "Writing %s" "${conf##*/}"
echo '# live session configuration' > ${conf}
echo '' >> ${conf}
echo '# autologin' >> ${conf}
echo "AUTOLOGIN=${AUTOLOGIN}" >> ${conf}
echo '' >> ${conf}
echo '# live user name' >> ${conf}
echo "USERNAME=${USERNAME}" >> ${conf}
echo '' >> ${conf}
echo '# live password' >> ${conf}
echo "PASSWORD=${PASSWORD}" >> ${conf}
echo '' >> ${conf}
echo '# live group membership' >> ${conf}
echo "ADDGROUPS='${ADDGROUPS}'" >> ${conf}
msg2 "Writing live.conf"
local conf=''
conf+=$(printf '%s\n' '# live session configuration')
conf+=$(printf "\nAUTOLOGIN=%s\n" "${AUTOLOGIN}")
conf+=$(printf "\nUSER_NAME=%s\n" "${USER_NAME}")
conf+=$(printf "\nPASSWORD=%s\n" "${PASSWORD}")
conf+=$(printf "\nADDGROUPS='%s'\n" "${ADDGROUPS}")
printf '%s' "$conf"
}
load_pkgs(){

View File

@@ -327,7 +327,8 @@ configure_live_image(){
configure_system "$fs"
configure_services "$fs"
configure_calamares "$fs"
write_live_session_conf "$fs"
[[ ! -d "$fs/etc/artools" ]] && mkdir -p "$fs/etc/artools"
write_live_session_conf > "$fs/etc/artools/live.conf"
msg "Done configuring [livefs]"
}

View File

@@ -9,7 +9,7 @@
# GNU General Public License for more details.
write_yaml_header(){
printf '%s\n%s' "%YAML 1.2" '---'
printf '%s' '---'
}
write_empty_line(){