mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-09 05:56:58 +02:00
Simplify X session startup. This CL skips the typical Xsession
stuff that parses a bunch of files in favor of just starting our session script under a console-kit session. We don't need any of the typical Xsession start stuff and this is simpler to understand. Since we don't use Xsession.d, we no longer need to delete certain files from that directory. The CL also has the login_manager package install our own slim.conf so that we don't need to be modifying the default one using sed from customize_rootfs and the login_manager maintainer scripts. Review URL: http://chromereview.prom.corp.google.com/1188025 git-svn-id: svn://chrome-svn/chromeos/trunk@209 06c00378-0e64-4dae-be16-12b19f9950a1
This commit is contained in:
parent
ab63574c0e
commit
b35803f10c
@ -435,24 +435,6 @@ rm -f /etc/init/rc.conf
|
|||||||
rm -f /etc/init/rcS.conf
|
rm -f /etc/init/rcS.conf
|
||||||
rm -f /etc/init/rc-sysinit.conf
|
rm -f /etc/init/rc-sysinit.conf
|
||||||
|
|
||||||
# Start X on vt01
|
|
||||||
sed -i '{ s/xserver_arguments .*/xserver_arguments -nolisten tcp vt01/ }' \
|
|
||||||
/etc/slim.conf
|
|
||||||
|
|
||||||
# Clean out unneeded Xsession scripts
|
|
||||||
XSESSION_D="/etc/X11/Xsession.d"
|
|
||||||
KEEPERS="20x11-common_process-args 51x11-chromeos-set-startup \
|
|
||||||
90consolekit 99x11-common_start"
|
|
||||||
for script in ${KEEPERS}
|
|
||||||
do
|
|
||||||
mv "$XSESSION_D"/"$script" /tmp
|
|
||||||
done
|
|
||||||
rm -rf "$XSESSION_D"/*
|
|
||||||
for script in ${KEEPERS}
|
|
||||||
do
|
|
||||||
mv /tmp/"$script" "$XSESSION_D"
|
|
||||||
done
|
|
||||||
|
|
||||||
# By default, xkb writes computed configuration data to
|
# By default, xkb writes computed configuration data to
|
||||||
# /var/lib/xkb. It can re-use this data to reduce startup
|
# /var/lib/xkb. It can re-use this data to reduce startup
|
||||||
# time. In addition, if it fails to write we've observed
|
# time. In addition, if it fails to write we've observed
|
||||||
|
Loading…
Reference in New Issue
Block a user