From cc9a75cffbf5c274640dead26d6015494e0e73d0 Mon Sep 17 00:00:00 2001 From: "tedbo@google.com" Date: Thu, 5 Nov 2009 22:10:56 +0000 Subject: [PATCH] [shutdown]: Make shutdown faster. This CL changes the shutdown sequence to be more upstartified. We switch from using the stock shutdown scripts to a custom sequence that basically terminates chrome cleanly and then kills all processes that hold open files on our stateful partition and crypto-home so that we can unmount them cleanly and shutdown. The change adds a ui.conf upstart job that lets upstart track the login manager. Starting the ui will start the login manager and enable a graphical session; stopping the ui will cleanly kill chrome and then tear down the graphical session. Review URL: http://chromereview.prom.corp.google.com/1180066 git-svn-id: svn://chrome-svn/chromeos/trunk@169 06c00378-0e64-4dae-be16-12b19f9950a1 --- customize_rootfs.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/customize_rootfs.sh b/customize_rootfs.sh index c2a57f1248..672d5ea61d 100755 --- a/customize_rootfs.sh +++ b/customize_rootfs.sh @@ -449,10 +449,6 @@ rm -f /etc/init/rc-sysinit.conf sed -i '{ s/xserver_arguments .*/xserver_arguments -nolisten tcp vt01/ }' \ /etc/slim.conf -# Use our own rcS init script -mv /etc/init.d/rcS /etc/init.d/rcS.orig -ln -s /etc/init.d/chromeos_init.sh /etc/init.d/rcS - # Clean out unneeded Xsession scripts XSESSION_D="/etc/X11/Xsession.d" KEEPERS="20x11-common_process-args 51x11-chromeos-set-startup \