[oe-commits] Chen Qi : shutdown-desktop: use poweroff for the Exec field in the shutdown.desktop

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: c87d44a079c13a98734f9f726ec1b55d86793f8c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c87d44a079c13a98734f9f726ec1b55d86793f8c

Author: Chen Qi <Qi.Chen at windriver.com>
Date:   Wed Jan 15 15:10:14 2014 +0800

shutdown-desktop: use poweroff for the Exec field in the shutdown.desktop

Use 'poweroff' instead of 'halt' for the Exec field in the shutdown.desktop.

The purpose of this patch is to make the 'shutdown' icon on on our sato
images work as expected for both sysvinit and systemd images. Previously,
the Exec field was 'halt'. The `halt' command could poweroff the system
in sysvinit images but it only could halt the system in systemd images.
The difference is due to the different implementations of the `halt' command.

In sysvinit, the `halt' command will effective execute `/sbin/init 0'. This
is for the compatibility with sysvinit 2.4, as stated in the comments of the
source code. In systemd, the `halt' command will effectively execute the
reboot(RB_HALT_SYSTEM).

As the 'shutdown' icon is expected to actually shutdown the system, we should
use poweroff instead of halt for its Exec field.

[YOCTO #4347]

Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop b/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop
index 2726889..99bee4c 100644
--- a/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop
+++ b/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Type=Application
 Name=Shutdown
 Comment=Close down the machine safely
-Exec=halt
+Exec=poweroff
 Icon=system-shutdown
 Terminal=false
 Categories=Utility;