root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

util-yaml: only write displaymanager.conf if unpackfs true and netinstall false; this should enable CAL fallback detection for netinstall

Browse source
This commit is contained in:
udeved 2016-09-25 22:07:16 +02:00
parent 1ba3fbe021
commit 3784265d8c
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/util-yaml.sh
View file

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