From 7d4bb08b0693cfd0371b068c0bbaa169b0df6e5a Mon Sep 17 00:00:00 2001 From: udeved Date: Tue, 27 Sep 2016 18:41:53 +0200 Subject: [PATCH] util-yaml: support autodetection of DM for chrootcfg --- lib/util-yaml.sh | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh index b8fda6e..9364fd8 100644 --- a/lib/util-yaml.sh +++ b/lib/util-yaml.sh @@ -142,13 +142,23 @@ write_displaymanager_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" + if ${unpackfs}; then + 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 + else + echo "displaymanagers:" >> "$conf" + echo " - lightdm" >> "$conf" + echo " - gdm" >> "$conf" + echo " - mdm" >> "$conf" + echo " - sddm" >> "$conf" + echo " - lxdm" >> "$conf" + echo " - silm" >> "$conf" fi echo '' >> "$conf" echo "basicSetup: false" >> "$conf"