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

make lightdm work

Browse source
This commit is contained in:
udeved 2014-12-16 00:34:06 +01:00
parent a142c593f0
commit a00b0012b1
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/util-iso.sh
View file

@ -18,9 +18,9 @@ copy_userconfig(){
}
copy_initcpio(){
cp /usr/lib/initcpio/hooks/miso* ${work_dir}/boot-image/usr/lib/initcpio/hooks
cp /usr/lib/initcpio/install/miso* ${work_dir}/boot-image/usr/lib/initcpio/install
cp mkinitcpio.conf ${work_dir}/boot-image/etc/mkinitcpio-${manjaroiso}.conf
cp /usr/lib/initcpio/hooks/miso* ${work_dir}/boot-image/usr/lib/initcpio/hooks
cp /usr/lib/initcpio/install/miso* ${work_dir}/boot-image/usr/lib/initcpio/install
cp mkinitcpio.conf ${work_dir}/boot-image/etc/mkinitcpio-${manjaroiso}.conf
}
copy_overlay(){
@ -205,7 +205,9 @@ make_de_image() {
copy_overlay_desktop
fi
configure_plymouth "${work_dir}/overlay-image"
configure_displaymanager "${work_dir}/${desktop}-image"
configure_plymouth "${work_dir}/${desktop}-image"
# Clean up GnuPG keys
rm -rf "${work_dir}/${desktop}-image/etc/pacman.d/gnupg"

27
lib/util-livecd.sh
View file

@ -488,10 +488,9 @@ configure_services(){
# $1: chroot
configure_displaymanager(){
_displaymanager=''
msg2 "Configuring Displaymanager ..."
# do_setuplightdm
msg2 "Configuring Displaymanager ..."
if [ -e "$1/usr/bin/lightdm" ] ; then
#mkdir -p /run/lightdm > /dev/null
if [ -e "$1/usr/bin/startxfce4" ] ; then
sed -i -e 's/^.*user-session=.*/user-session=xfce/' $1/etc/lightdm/lightdm.conf
@ -517,18 +516,24 @@ configure_displaymanager(){
if [ -e "$1/usr/bin/pekwm" ] ; then
sed -i -e 's/^.*user-session=.*/user-session=pekwm/' $1/etc/lightdm/lightdm.conf
fi
sed -i -e "s/^.*autologin-user=.*/autologin-user=${username}/" $1/etc/lightdm/lightdm.conf
sed -i -e 's/^.*autologin-user-timeout=.*/autologin-user-timeout=0/' $1/etc/lightdm/lightdm.conf
#sed -i -e 's/^.*autologin-in-background=.*/autologin-in-background=true/' /etc/lightdm/lightdm.conf
chroot-run $1 groupadd autologin
chroot-run $1 gpasswd -a ${username} autologin &> /dev/null
chmod +r $1/etc/lightdm/lightdm.conf
# livecd fix
#mkdir -p $1/var/lib/lightdm-data
if [[ $1 != "${work_dir}/${desktop}-image" ]]; then
#mkdir -p /run/lightdm > /dev/null
sed -i -e "s/^.*autologin-user=.*/autologin-user=${username}/" $1/etc/lightdm/lightdm.conf
sed -i -e 's/^.*autologin-user-timeout=.*/autologin-user-timeout=0/' $1/etc/lightdm/lightdm.conf
#sed -i -e 's/^.*autologin-in-background=.*/autologin-in-background=true/' /etc/lightdm/lightdm.conf
chroot-run $1 gpasswd -a ${username} autologin &> /dev/null
# livecd fix
mkdir -p $1/var/lib/lightdm-data
fi
#chmod +r $1/etc/lightdm/lightdm.conf
if [[ -e $1/usr/bin/systemd ]]; then
chroot-run $1 systemd-tmpfiles --create /usr/lib/tmpfiles.d/lightdm.conf
chroot-run $1 systemd-tmpfiles --create --remove