Move post-stop script for ibus daemons from ibus.conf to ui.conf.

Move post-stop script for ibus daemons from ibus.conf to ui.conf.

Since we have deleted "script ... end script" section of ibus.conf, the post-stop script in ibus.conf is no longer working. We have to move the script somewhere else.

BUG=chromium-os:6515
TEST=see the bug. manually checked that the script in ui.conf kills ibus daemons.

[satorux1, 2010-09-09 01:22:25]

Thank you for the fix!

http://codereview.chromium.org/3354014/diff/1/3
File ui.conf (right):

http://codereview.chromium.org/3354014/diff/1/3#newcode83
ui.conf:83: # Note that IBus processes are not mananged by Upstart.
... not managed by Upstart. IBus processes are launched from Chrome.

http://codereview.chromium.org/3354014/diff/1/3#newcode84
ui.conf:84: term_process "(^X$|candidate_w.*|ibus-[dem].*)"
The pattern looks a bit awkward to me. The following would be a bit simpler?
Please also mention candidate_window in the comment.

candidate_window|ibus-.*

[Yusuke Sato, 2010-09-09 01:39:58]

http://codereview.chromium.org/3354014/diff/1/3
File ui.conf (right):

http://codereview.chromium.org/3354014/diff/1/3#newcode83
ui.conf:83: # Note that IBus processes are not mananged by Upstart.
On 2010/09/09 01:22:25, satorux1 wrote:
> ... not managed by Upstart. IBus processes are launched from Chrome.

Done.

http://codereview.chromium.org/3354014/diff/1/3#newcode84
ui.conf:84: term_process "(^X$|candidate_w.*|ibus-[dem].*)"
removed [dem].

re candidate_window, I used the expression since the process name is too long
for pkill to handle. added comment.

On 2010/09/09 01:22:25, satorux1 wrote:
> The pattern looks a bit awkward to me. The following would be a bit simpler?
> Please also mention candidate_window in the comment.
> 
> candidate_window|ibus-.*
> 
>

[satorux1, 2010-09-09 01:42:59]

LGTM.

Thank you for adding comments. That would protect us from someone like me trying
to change the pattern from candidate_w.* to candidate_window :)

[Zachary Kuznia, 2010-09-09 03:13:55]

LGTM

On 2010/09/09 01:42:59, satorux1 wrote:
> LGTM.
> 
> Thank you for adding comments. That would protect us from someone like me
trying
> to change the pattern from candidate_w.* to candidate_window :)

[Daniel Erat, 2010-09-09 05:54:35]

LGTM

On Wed, Sep 8, 2010 at 6:17 PM,  <yusukes@chromium.org> wrote:
> Reviewers: Zachary Kuznia, Daniel Erat,
>
> Description:
> Move post-stop script for ibus daemons from ibus.conf to ui.conf.
>
> Since we have deleted "script ... end script" section of ibus.conf, the
> post-stop script in ibus.conf is no longer working. We have to move the
> script
> somewhere else.
>
> BUG=chromium-os:6515
> TEST=see the bug. manually checked that the script in ui.conf kills ibus
> daemons.
>
> Please review this at http://codereview.chromium.org/3354014/show
>
> SVN Base: ssh://git@chromiumos-git//init.git
>
> Affected files:
>  D ibus.conf
>  M ui.conf
>
>
> Index: ibus.conf
> diff --git a/ibus.conf b/ibus.conf
> deleted file mode 100644
> index
>
2af29123c4d7d5c183d6cb04f8c66a2944f0dd91..0000000000000000000000000000000000000000
> --- a/ibus.conf
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
> -# Use of this source code is governed by a BSD-style license that can be
> -# found in the LICENSE file.
> -
> -description   "Run ibus-daemon and ibus-memconf"
> -author        "chromium-os-dev@googlegroups.com"
> -
> -stop on stopping ui
> -
> -# ibus-daemon creates a temporary file in /home/chronos,
> -# not in /home/chronos/user.
> -env HOME=/home/chronos
> -
> -post-stop script
> -
> -set +e
> -. /sbin/killers
> -
> -# Ensure ibus-daemon  and sub-processes are terminated. Note that these
> -# processes are not mananged by Upstart.
> -term_process "(candidate_w.*|ibus-[dem].*)"
> -
> -# Since Chrome OS regenerates /var/lib/dbus/machine-id every time when the
> OS
> -# starts, ibus-daemon creates a new file in ${HOME}/.config/ibus/bus/ every
> time
> -# when it starts. It's better to remove them when ibus-daemon is
> terminated.
> -rm -f ${HOME}/.config/ibus/bus/*
> -
> -end script
> Index: ui.conf
> diff --git a/ui.conf b/ui.conf
> index
>
0f4b9e10751dec239e47a7a16ea97b18a39a0487..38a539ddfe2259cd046f4bfac250807864ab9ed1
> 100644
> --- a/ui.conf
> +++ b/ui.conf
> @@ -78,7 +78,13 @@ 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, ibus-daemon, and sub processes of ibus-daemon are terminated.
> +# Note that IBus processes are not mananged by Upstart.
> +term_process "(^X$|candidate_w.*|ibus-[dem].*)"
> +
> +# 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
>
>
>