Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
f5d07a597f |
@@ -56,11 +56,11 @@ load_live_config(){
|
||||
|
||||
[[ -z ${autologin} ]] && autologin=true
|
||||
|
||||
[[ -z ${username} ]] && username="cromnix"
|
||||
[[ -z ${username} ]] && username="artix"
|
||||
|
||||
[[ -z ${password} ]] && password="cromnix"
|
||||
[[ -z ${password} ]] && password="artix"
|
||||
|
||||
[[ -z ${addgroups} ]] && addgroups=""
|
||||
[[ -z ${addgroups} ]] && addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,audio"
|
||||
|
||||
echo "Loaded ${live_conf}: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
|
||||
|
||||
@@ -79,9 +79,7 @@ is_valid_de(){
|
||||
load_desktop_map(){
|
||||
local _space="s| ||g" _clean=':a;N;$!ba;s/\n/ /g' _com_rm="s|#.*||g" \
|
||||
file=${DATADIR}/desktop.map
|
||||
local desktop_map=$(sed "$_com_rm" "$file" \
|
||||
| sed "$_space" \
|
||||
| sed "$_clean")
|
||||
local desktop_map=$(sed "$_com_rm" "$file" | sed "$_space" sed "$_clean")
|
||||
echo ${desktop_map}
|
||||
}
|
||||
|
||||
@@ -149,10 +147,6 @@ configure_displaymanager(){
|
||||
if ${autologin};then
|
||||
sed -i -e "s/\[daemon\]/\[daemon\]\nAutomaticLogin=${username}\nAutomaticLoginEnable=True/" /etc/gdm/custom.conf
|
||||
fi
|
||||
elif [[ -f /usr/bin/mdm ]];then
|
||||
if $(is_valid_de); then
|
||||
sed -i "s|default.desktop|$default_desktop_file.desktop|g" /etc/mdm/custom.conf
|
||||
fi
|
||||
elif [[ -f /usr/bin/sddm ]];then
|
||||
if $(is_valid_de); then
|
||||
sed -i -e "s|^Session=.*|Session=$default_desktop_file.desktop|" /etc/sddm.conf
|
||||
@@ -277,10 +271,10 @@ write_unpack_conf(){
|
||||
local conf="/etc/calamares/modules/unpackfs.conf"
|
||||
echo "---" > "$conf"
|
||||
echo "unpack:" >> "$conf"
|
||||
echo " - source: \"/run/miso/bootmnt/artix/$(uname -m)/rootfs.sfs\"" >> "$conf"
|
||||
echo " - source: \"/run/artix/bootmnt/artix/$(uname -m)/rootfs.sfs\"" >> "$conf"
|
||||
echo " sourcefs: \"squashfs\"" >> "$conf"
|
||||
echo " destination: \"\"" >> "$conf"
|
||||
echo " - source: \"/run/miso/bootmnt/artix/$(uname -m)/desktopfs.sfs\"" >> "$conf"
|
||||
echo " - source: \"/run/artix/bootmnt/artix/$(uname -m)/desktopfs.sfs\"" >> "$conf"
|
||||
echo " sourcefs: \"squashfs\"" >> "$conf"
|
||||
echo " destination: \"\"" >> "$conf"
|
||||
}
|
||||
|
Reference in New Issue
Block a user