Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(689)

Unified Diff: ui.conf

Issue 3354014: Move post-stop script for ibus daemons from ibus.conf to ui.conf. (Closed) Base URL: ssh://git@chromiumos-git//init.git
Patch Set: review fix Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ibus.conf ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui.conf
diff --git a/ui.conf b/ui.conf
index 0f4b9e10751dec239e47a7a16ea97b18a39a0487..8badc64ffca7b4c0341c7fe1a0984836bd7ceca2 100644
--- a/ui.conf
+++ b/ui.conf
@@ -78,7 +78,15 @@ set +e
# Terminate any processes with files open on the mount point
kill_with_open_files_on /home/chronos/user
-term_process "^X$"
+
+# Ensure X, candidate_window for input methods, ibus-daemon, and sub processes
+# of ibus-daemon are terminated. Note that candidate_window and IBus processes
+# are not mananged by Upstart. They are launched from Chrome. ".*" is used
+# since the process name used for matching is limited to 15 characters.
+term_process "(^X$|candidate_w.*|ibus-.*)"
+
+# Remove ibus-daemon's PID file.
+rm -f /home/chronos/.config/ibus/bus/*
# Eventually, this will take a parameter specifying which user's dir to unmount.
/usr/sbin/cryptohome --action=unmount
« no previous file with comments | « ibus.conf ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698