Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
b4e6dface6 | |||
fa38579488 | |||
07c1605666 | |||
bfde5dbbb1 |
@@ -161,12 +161,12 @@ done
|
|||||||
|
|
||||||
shift $(($OPTIND - 1))
|
shift $(($OPTIND - 1))
|
||||||
|
|
||||||
|
${pretend} && display_settings && exit 1
|
||||||
|
|
||||||
check_root
|
check_root
|
||||||
|
|
||||||
prepare_traps
|
prepare_traps
|
||||||
|
|
||||||
prepare_build
|
prepare_build
|
||||||
|
|
||||||
${pretend} && display_settings && exit 1
|
|
||||||
|
|
||||||
build
|
build
|
||||||
|
@@ -60,7 +60,7 @@ load_profile(){
|
|||||||
[[ -z ${PASSWORD} ]] && PASSWORD="artix"
|
[[ -z ${PASSWORD} ]] && PASSWORD="artix"
|
||||||
|
|
||||||
if [[ -z ${ADDGROUPS} ]];then
|
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
|
fi
|
||||||
|
|
||||||
if [[ -z ${SERVICES[@]} ]];then
|
if [[ -z ${SERVICES[@]} ]];then
|
||||||
@@ -82,23 +82,14 @@ load_profile(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
write_live_session_conf(){
|
write_live_session_conf(){
|
||||||
local path=$1${SYSCONFDIR}
|
msg2 "Writing live.conf"
|
||||||
[[ ! -d $path ]] && mkdir -p "$path"
|
local conf=''
|
||||||
local conf=$path/live.conf
|
conf+=$(printf '%s\n' '# live session configuration')
|
||||||
msg2 "Writing %s" "${conf##*/}"
|
conf+=$(printf "\nAUTOLOGIN=%s\n" "${AUTOLOGIN}")
|
||||||
echo '# live session configuration' > ${conf}
|
conf+=$(printf "\nUSER_NAME=%s\n" "${USER_NAME}")
|
||||||
echo '' >> ${conf}
|
conf+=$(printf "\nPASSWORD=%s\n" "${PASSWORD}")
|
||||||
echo '# autologin' >> ${conf}
|
conf+=$(printf "\nADDGROUPS='%s'\n" "${ADDGROUPS}")
|
||||||
echo "AUTOLOGIN=${AUTOLOGIN}" >> ${conf}
|
printf '%s' "$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}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
load_pkgs(){
|
load_pkgs(){
|
||||||
|
@@ -327,7 +327,8 @@ configure_live_image(){
|
|||||||
configure_system "$fs"
|
configure_system "$fs"
|
||||||
configure_services "$fs"
|
configure_services "$fs"
|
||||||
configure_calamares "$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]"
|
msg "Done configuring [livefs]"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -9,7 +9,7 @@
|
|||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
write_yaml_header(){
|
write_yaml_header(){
|
||||||
printf '%s\n%s' "%YAML 1.2" '---'
|
printf '%s' '---'
|
||||||
}
|
}
|
||||||
|
|
||||||
write_empty_line(){
|
write_empty_line(){
|
||||||
|
Reference in New Issue
Block a user