From: Chen Qi Date: Wed, 15 Jan 2014 07:10:14 +0000 (+0800) Subject: shutdown-desktop: use poweroff for the Exec field in the shutdown.desktop X-Git-Tag: 2015-4~4015 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c87d44a079c13a98734f9f726ec1b55d86793f8c;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop b/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop index 272688922c..99bee4c241 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;