sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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]

(From OE-Core rev: c87d44a079c13a98734f9f726ec1b55d86793f8c)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Chen Qi 2014-01-15 15:10:14 +08:00 committed by Richard Purdie
parent f5b5edd4d8
commit 21b4548661
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop
View File

@ -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;