From 3784265d8c5aef7ee22e7362a46612a9748f2847 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Sun, 25 Sep 2016 22:07:16 +0200
Subject: [PATCH] util-yaml: only write displaymanager.conf if unpackfs true
 and netinstall false; this should enable CAL fallback detection for
 netinstall

---
 lib/util-yaml.sh | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh
index d0cd19f..b8fda6e 100644
--- a/lib/util-yaml.sh
+++ b/lib/util-yaml.sh
@@ -139,18 +139,20 @@ write_services_conf(){
 
 write_displaymanager_conf(){
     local conf="${modules_dir}/displaymanager.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo "---" > "$conf"
-    echo "displaymanagers:" >> "$conf"
-    echo "  - ${displaymanager}" >> "$conf"
-    echo '' >> "$conf"
-    if $(is_valid_de); then
-        echo "defaultDesktopEnvironment:" >> "$conf"
-        echo "    executable: \"${default_desktop_executable}\"" >> "$conf"
-        echo "    desktopFile: \"${default_desktop_file}\"" >> "$conf"
+    if ${unpackfs} && ! ${netinstall};then
+        msg2 "Writing %s ..." "${conf##*/}"
+        echo "---" > "$conf"
+        echo "displaymanagers:" >> "$conf"
+        echo "  - ${displaymanager}" >> "$conf"
+        echo '' >> "$conf"
+        if $(is_valid_de); then
+            echo "defaultDesktopEnvironment:" >> "$conf"
+            echo "    executable: \"${default_desktop_executable}\"" >> "$conf"
+            echo "    desktopFile: \"${default_desktop_file}\"" >> "$conf"
+        fi
+        echo '' >> "$conf"
+        echo "basicSetup: false" >> "$conf"
     fi
-    echo '' >> "$conf"
-    echo "basicSetup: false" >> "$conf"
 }
 
 write_initcpio_conf(){