xorg: remove code to configure KDM that is not used any longer
This commit is contained in:
parent
07581d2546
commit
f0dbdca8a8
@ -18,22 +18,6 @@ me="xorg"
|
|||||||
|
|
||||||
XORGCONF=/etc/X11/xorg.conf
|
XORGCONF=/etc/X11/xorg.conf
|
||||||
|
|
||||||
# kde-config is possibly not called for boot time speed
|
|
||||||
[ -r /opt/kde/share/config/kdm/kdmrc ] && KDMRC=/opt/kde/share/config/kdm/kdmrc || {
|
|
||||||
[ -r /opt/kde3/share/config/kdm/kdmrc ] && KDMRC=/opt/kde3/share/config/kdm/kdmrc || \
|
|
||||||
KDMRC="$(kde-config --prefix 2>/dev/null)/share/config/kdm/kdmrc"
|
|
||||||
}
|
|
||||||
|
|
||||||
[ -w "$KDMRC" ] ||
|
|
||||||
{ logmsg "$me" "warning: cannot find kdmrc; KDM will not be configured"
|
|
||||||
unset KDMRC; }
|
|
||||||
|
|
||||||
#postplugnew_file=$postplugnewdir/xorg
|
|
||||||
#rm -f $postplugnew_file
|
|
||||||
|
|
||||||
[ -e /etc/X11/XF86Config -a ! -e /etc/X11/xorg.conf ] &&
|
|
||||||
cp /etc/X11/XF86Config $XORGCONF
|
|
||||||
|
|
||||||
kernel_min=$(uname -r | sed -e 's,[^\.]*\.,,' -e 's,\..*,,')
|
kernel_min=$(uname -r | sed -e 's,[^\.]*\.,,' -e 's,\..*,,')
|
||||||
|
|
||||||
# xorg_section_screen_config()
|
# xorg_section_screen_config()
|
||||||
@ -101,7 +85,7 @@ _EOF
|
|||||||
|
|
||||||
# configure kdm as the default login_manager if none is set
|
# configure kdm as the default login_manager if none is set
|
||||||
/usr/sbin/alternatives --display login_manager >/dev/null ||
|
/usr/sbin/alternatives --display login_manager >/dev/null ||
|
||||||
/usr/sbin/alternatives --install /usr/sbin/login_manager login_manager /opt/kde3/bin/kdm 20
|
/usr/sbin/alternatives --install /usr/sbin/login_manager login_manager /opt/kde/bin/kdm 20
|
||||||
|
|
||||||
telinit q
|
telinit q
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user