|
|
|
@ -2262,7 +2262,7 @@ install_manjaro_de_wm() {
|
|
|
|
|
# enable display manager for openrc
|
|
|
|
|
if [[ "$(cat /tmp/.display-manager)" == sddm ]]; then
|
|
|
|
|
sed -i "s/$(grep "DISPLAYMANAGER=" /mnt/etc/conf.d/xdm)/DISPLAYMANAGER=\"sddm\"/g" /mnt/etc/conf.d/xdm
|
|
|
|
|
arch_chroot "rc-update add xdm default" 2>/tmp/.errlog
|
|
|
|
|
arch_chroot "rc-update add xdm default || true" 2>/tmp/.errlog
|
|
|
|
|
check_for_error
|
|
|
|
|
set_sddm_ck
|
|
|
|
|
elif [[ "$(cat /tmp/.display-manager)" == lightdm ]]; then
|
|
|
|
@ -2276,10 +2276,8 @@ install_manjaro_de_wm() {
|
|
|
|
|
fi
|
|
|
|
|
else
|
|
|
|
|
eval $(grep -e "enable_systemd=" $profile | sed 's/# //g')
|
|
|
|
|
echo "${enable_systemd[@]}" > /tmp/.services
|
|
|
|
|
for service in "$(cat /tmp/.services)" ; do
|
|
|
|
|
arch_chroot "systemctl enable $service"
|
|
|
|
|
done
|
|
|
|
|
echo "${enable_systemd[@]}" > /mnt/tmp/.services
|
|
|
|
|
arch_chroot "systemctl enable $(cat /mnt/tmp/.services)"
|
|
|
|
|
arch_chroot "systemctl disable pacman-init"
|
|
|
|
|
# enable display manager for systemd
|
|
|
|
|
if [[ "$(cat /tmp/.display-manager)" == lightdm ]]; then
|
|
|
|
@ -2324,7 +2322,7 @@ install_manjaro_de_wm() {
|
|
|
|
|
# If at least one package, install.
|
|
|
|
|
if [[ $(cat ${PACKAGES}) != "" ]]; then
|
|
|
|
|
clear
|
|
|
|
|
basestrap ${MOUNTPOINT} $(cat ${PACKAGES}) 2>/tmp/.errlog
|
|
|
|
|
basestrap -i ${MOUNTPOINT} $(cat ${PACKAGES}) 2>/tmp/.errlog
|
|
|
|
|
check_for_error
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|