util-live: fix load_desktop_map()

bin/artix-live.in

@@ -55,7 +55,7 @@ echo "Configured displaymanager: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFIL
 
 livetimer=$(get_timer_ms)
 configure_calamares
-echo "Configured calamares unpack ${unpack} $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
+echo "Configured calamares netinstall ${netinstall} $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
 livetimer=$(get_timer_ms)
 configure_user_root /

lib/util-live.sh

@@ -34,7 +34,7 @@ get_tz(){
 }
 
 get_cal_mode(){
-    echo $(kernel_cmdline unpack)
+    echo $(kernel_cmdline netinstall)
 }
 
 get_timer_ms(){
@@ -79,7 +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}
 }
 
@@ -267,28 +267,14 @@ configure_language(){
     echo "Configured timezone: ${timezone}" >> "${LOGFILE}"
 }
 
-write_unpack_conf(){
-    local conf="/etc/calamares/modules/unpackfs.conf"
-    echo "---" > "$conf"
-    echo "unpack:" >> "$conf"
-    echo "    - source: \"/run/artix/bootmnt/artix/$(uname -m)/rootfs.sfs\"" >> "$conf"
-    echo "      sourcefs: \"squashfs\"" >> "$conf"
-    echo "      destination: \"\"" >> "$conf"
-    echo "    - source: \"/run/artix/bootmnt/artix/$(uname -m)/desktopfs.sfs\"" >> "$conf"
-    echo "      sourcefs: \"squashfs\"" >> "$conf"
-    echo "      destination: \"\"" >> "$conf"
-}
-
 configure_calamares(){
     if [[ -f /usr/bin/calamares ]];then
-        unpack=$(get_cal_mode)
+        netinstall=$(get_cal_mode)
-        if [[ "${unpack}" == 'yes' ]];then
+        if [[ "${netinstall}" == 'no' ]];then
             sed -e "/- netinstall/d" \
                 -e "s|- chrootcfg|- unpackfs|" -i /etc/calamares/settings.conf
 
             sed -e '$ d' -i /etc/calamares/modules/welcome.conf
-
-            write_unpack_conf
         fi
     fi
 }