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

Revert "Move post-stop script for ibus daemons from ibus.conf to ui.conf."
We can kill ibus daemons in ibus.conf. See 6515 for details.

This reverts commit ae978ccf660d434fd94b3f8d0f24b554ec00110f.

BUG=chromium-os:6515
TEST=none

[Chris Masone, 2010-09-14 14:50:26]

LGTM

On Tue, Sep 14, 2010 at 3:17 AM, <yusukes@chromium.org> wrote:

> Reviewers: Chris Masone,
>
> Description:
> Revert "Move post-stop script for ibus daemons from ibus.conf to ui.conf."
> We can kill ibus daemons in ibus.conf. See 6515 for details.
>
> This reverts commit ae978ccf660d434fd94b3f8d0f24b554ec00110f.
>
> BUG=chromium-os:6515
> TEST=none
>
> Please review this at http://codereview.chromium.org/3413002/show
>
> SVN Base: ssh://git@chromiumos-git//init.git
>
> Affected files:
>  A ibus.conf
>  M ui.conf
>
>
> Index: ibus.conf
> diff --git a/ibus.conf b/ibus.conf
> new file mode 100644
> index
>
0000000000000000000000000000000000000000..2af29123c4d7d5c183d6cb04f8c66a2944f0dd91
> --- /dev/null
> +++ b/ibus.conf
> @@ -0,0 +1,28 @@
> +# 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
>
8badc64ffca7b4c0341c7fe1a0984836bd7ceca2..0f4b9e10751dec239e47a7a16ea97b18a39a0487
> 100644
> --- a/ui.conf
> +++ b/ui.conf
> @@ -78,15 +78,7 @@ set +e
>
>  # Terminate any processes with files open on the mount point
>  kill_with_open_files_on /home/chronos/user
> -
> -# 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/*
> +term_process "^X$"
>
>  # Eventually, this will take a parameter specifying which user's dir to
> unmount.
>  /usr/sbin/cryptohome --action=unmount
>
>
>