outsource lightdm and kdm setup partially
This commit is contained in:
parent
f8b2bb9c65
commit
ad6910178b
3 changed files with 33 additions and 14 deletions
|
@ -157,26 +157,26 @@ configure_displaymanager(){
|
|||
sed -i -e 's/^.*user-session=.*/user-session=pekwm/' $1/etc/lightdm/lightdm.conf
|
||||
fi
|
||||
|
||||
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/' $1/etc/lightdm/lightdm.conf
|
||||
|
||||
if [[ "$1" != "${work_dir}/${desktop}-image" ]]; then
|
||||
|
||||
sed -i -e "s/^.*autologin-user=.*/autologin-user=${username}/" $1/etc/lightdm/lightdm.conf
|
||||
|
||||
chroot-run $1 gpasswd -a ${username} autologin &> /dev/null
|
||||
chroot-run $1 groupadd autologin
|
||||
fi
|
||||
# sed -i -e 's/^.*autologin-user-timeout=.*/autologin-user-timeout=0/' $1/etc/lightdm/lightdm.conf
|
||||
|
||||
# if [[ "$1" != "${work_dir}/${desktop}-image" ]]; then
|
||||
#
|
||||
# sed -i -e "s/^.*autologin-user=.*/autologin-user=${username}/" $1/etc/lightdm/lightdm.conf
|
||||
#
|
||||
# chroot-run $1 groupadd autologin
|
||||
# chroot-run $1 gpasswd -a ${username} autologin &> /dev/null
|
||||
#
|
||||
# fi
|
||||
|
||||
if [[ -e $1/usr/bin/openrc ]];then
|
||||
echo "d /run/lightdm 0711 lightdm lightdm" > $1/usr/lib/tmpfiles.d/lightdm.conf
|
||||
fi
|
||||
;;
|
||||
'kdm')
|
||||
chroot-run $1 xdg-icon-resource forceupdate --theme hicolor &> /dev/null
|
||||
if [ -e "$1/usr/bin/update-desktop-database" ] ; then
|
||||
chroot-run $1 update-desktop-database -q
|
||||
fi
|
||||
# chroot-run $1 xdg-icon-resource forceupdate --theme hicolor &> /dev/null
|
||||
# if [ -e "$1/usr/bin/update-desktop-database" ] ; then
|
||||
# chroot-run $1 update-desktop-database -q
|
||||
# fi
|
||||
sed -i -e "s/^.*AutoLoginUser=.*/AutoLoginUser=${username}/" $1/usr/share/config/kdm/kdmrc
|
||||
sed -i -e "s/^.*AutoLoginPass=.*/AutoLoginPass=${username}/" $1/usr/share/config/kdm/kdmrc
|
||||
;;
|
||||
|
|
|
@ -412,3 +412,19 @@ configure_thus_live(){
|
|||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
fix_kdm(){
|
||||
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
|
||||
if [ -e "/usr/bin/update-desktop-database" ] ; then
|
||||
update-desktop-database -q
|
||||
fi
|
||||
}
|
||||
|
||||
fix_lightdm(){
|
||||
sed -i -e 's/^.*autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
|
||||
sed -i -e "s/^.*autologin-user=.*/autologin-user=${username}/" /etc/lightdm/lightdm.conf
|
||||
|
||||
groupadd autologin
|
||||
gpasswd -a ${username} autologin &> /dev/null
|
||||
|
||||
}
|
|
@ -55,6 +55,9 @@ DESTDIR="/"
|
|||
|
||||
install_localization_live "${DESTDIR}"
|
||||
|
||||
[[ -f /usr/bin/lightdm ]] && fix_lightdm
|
||||
[[ -f /usr/bin/kdm ]] && fix_kdm
|
||||
|
||||
echo "configure root password" >> /tmp/livecd.log
|
||||
|
||||
configure_user_root_live "${DESTDIR}"
|
||||
|
|
Loading…
Reference in a new issue