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

buildiso: rely on auto detection for the DE

Browse source
This commit is contained in:
udeved 2016-02-19 18:52:30 +01:00
parent 0eb437493e
commit 0c0fb0554e
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/profile.conf.example
View file

@ -2,15 +2,15 @@
###### use this file in the profile ###### ###### use this file in the profile ######
########################################## ##########################################
# use multilib packages; x86_64 only
# multilib="true"
# default displaymanager # default displaymanager
# displaymanager="none" # displaymanager="none"
# Set to false to disable autologin in the livecd # Set to false to disable autologin in the livecd
# autologin="true" # autologin="true"
# use multilib packages; x86_64 only
# multilib="true"
# nonfree xorg drivers # nonfree xorg drivers
# nonfree_xorg="true" # nonfree_xorg="true"

6
lib/util-iso-image.sh
View file

@ -186,8 +186,6 @@ load_desktop_map(){
detect_desktop_env(){ detect_desktop_env(){
local xs=$1/usr/share/xsessions ex=$1/usr/bin key val map=( $(load_desktop_map) ) local xs=$1/usr/share/xsessions ex=$1/usr/bin key val map=( $(load_desktop_map) )
if [[ "${default_desktop_executable}" == "none" ]] || \
[[ ${default_desktop_file} == "none" ]]; then
msg2 "Trying to detect desktop environment ..." msg2 "Trying to detect desktop environment ..."
for item in "${map[@]}";do for item in "${map[@]}";do
key=${item%:*} key=${item%:*}
@ -195,9 +193,11 @@ detect_desktop_env(){
if [[ -f $xs/$key.desktop ]] && [[ -f $ex/$val ]];then if [[ -f $xs/$key.desktop ]] && [[ -f $ex/$val ]];then
default_desktop_file="$key" default_desktop_file="$key"
default_desktop_executable="$val" default_desktop_executable="$val"
else
default_desktop_executable="none"
default_desktop_file="none"
fi fi
done done
fi
msg2 "Detected: %s" "${default_desktop_file}" msg2 "Detected: %s" "${default_desktop_file}"
} }

4
lib/util.sh
View file

@ -279,10 +279,6 @@ load_profile_config(){
[[ -z ${nonfree_xorg} ]] && nonfree_xorg="true" [[ -z ${nonfree_xorg} ]] && nonfree_xorg="true"
[[ -z ${default_desktop_executable} ]] && default_desktop_executable="none"
[[ -z ${default_desktop_file} ]] && default_desktop_file="none"
[[ -z ${efi_boot_loader} ]] && efi_boot_loader="grub" [[ -z ${efi_boot_loader} ]] && efi_boot_loader="grub"
[[ -z ${efi_part_size} ]] && efi_part_size="32M" [[ -z ${efi_part_size} ]] && efi_part_size="32M"