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

buildiso: rework DM service logic

Browse source 
clean up
This commit is contained in:
udeved 2016-08-04 21:03:06 +02:00
parent 97efcb4a67
commit 78ef8b8dd6
2 changed files with 16 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -135,45 +135,13 @@ configure_journald(){
sed -i 's/#\(Storage=\)auto/\1volatile/' "$conf"
}
configure_sysctl(){
msg2 "Configuring sysctl ..."
touch $1/etc/sysctl.conf
local conf=$1/etc/sysctl.d/100-manjaro.conf
# echo '# Virtual memory setting (swap file or partition)' > ${conf}
# echo 'vm.swappiness = 30' >> ${conf}
echo '# Enable the SysRq key' >> ${conf}
echo 'kernel.sysrq = 1' >> ${conf}
}
get_svc_dm(){
local service=${displaymanager}
if [[ $service != "sddm" ]] || \
[[ $service != "lxdm" ]];then
if ${plymouth_boot}; then
local svc="systemd/system/$service-plymouth.service"
if [[ -f $1/etc/$svc ]] || \
[[ -f $1/usr/lib/$svc ]];then
service="$service-plymouth"
fi
fi
fi
echo $service
}
configure_services(){
info "Configuring [%s]" "${initsys}"
case ${initsys} in
'openrc')
for svc in ${enable_openrc[@]}; do
if [[ $svc == "xdm" ]];then
if [[ ${displaymanager} != "none" ]];then
set_xdm "$1"
add_svc_rc "$1" "xdm"
fi
else
add_svc_rc "$1" "$svc"
fi
[[ $svc == "xdm" ]] && set_xdm "$1"
add_svc_rc "$1" "$svc"
done
for svc in ${enable_openrc_live[@]}; do
add_svc_rc "$1" "$svc"
@ -183,9 +151,6 @@ configure_services(){
for svc in ${enable_systemd[@]}; do
add_svc_sd "$1" "$svc"
done
if [[ ${displaymanager} != "none" ]];then
add_svc_sd "$1" "$(get_svc_dm $1)"
fi
for svc in ${enable_systemd_live[@]}; do
add_svc_sd "$1" "$svc"
done
@ -278,7 +243,6 @@ configure_system(){
echo ${hostname} > $1/etc/hostname
;;
'openrc')
configure_sysctl "$1"
local hn='hostname="'${hostname}'"'
sed -i -e "s|^.*hostname=.*|${hn}|" $1/etc/conf.d/hostname
;;

14
lib/util.sh
View file

@ -373,6 +373,15 @@ check_profile_vars(){
fi
}
get_svc(){
local service=${displaymanager}
if [[ $service != "sddm" ]] || \
[[ $service != "lxdm" ]];then
${plymouth_boot} && service="$service-plymouth"
fi
echo $service
}
load_profile_config(){
[[ -f $1 ]] || return 1
@ -431,6 +440,11 @@ load_profile_config(){
enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init')
fi
if [[ ${displaymanager} != "none" ]]; then
enable_openrc+=('xdm')
enable_systemd+=("$(get_svc)")
fi
[[ -z ${tracker_url} ]] && tracker_url='udp://mirror.strits.dk:6969'
[[ -z ${piece_size} ]] && piece_size=21