* [PATCH 0/1] shutdown-desktop: use poweroff for the Exec field in the shutdown.desktop
@ 2014-01-15 7:10 Chen Qi
2014-01-15 7:10 ` [PATCH 1/1] " Chen Qi
0 siblings, 1 reply; 5+ messages in thread
From: Chen Qi @ 2014-01-15 7:10 UTC (permalink / raw)
To: openembedded-core
The following changes since commit e4c23f7bcb79072ea6028fbdf8f3f0dc17a63371:
dropbear: Refresh pam patch so it applies against recent version (2014-01-14 21:57:22 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib ChenQi/shutdown-desktop
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/shutdown-desktop
Chen Qi (1):
shutdown-desktop: use poweroff for the Exec field in the
shutdown.desktop
.../shutdown-desktop/shutdown.desktop | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/1] shutdown-desktop: use poweroff for the Exec field in the shutdown.desktop
2014-01-15 7:10 [PATCH 0/1] shutdown-desktop: use poweroff for the Exec field in the shutdown.desktop Chen Qi
@ 2014-01-15 7:10 ` Chen Qi
2014-01-15 11:38 ` Otavio Salvador
0 siblings, 1 reply; 5+ messages in thread
From: Chen Qi @ 2014-01-15 7:10 UTC (permalink / raw)
To: openembedded-core
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_HATL_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@windriver.com>
---
.../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;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] shutdown-desktop: use poweroff for the Exec field in the shutdown.desktop
2014-01-15 7:10 ` [PATCH 1/1] " Chen Qi
@ 2014-01-15 11:38 ` Otavio Salvador
2014-01-15 11:51 ` Otavio Salvador
0 siblings, 1 reply; 5+ messages in thread
From: Otavio Salvador @ 2014-01-15 11:38 UTC (permalink / raw)
To: Chen Qi; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1283 bytes --]
On Wed, Jan 15, 2014 at 5:10 AM, Chen Qi <Qi.Chen@windriver.com> wrote:
> 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_HATL_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@windriver.com>
>
Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
[-- Attachment #2: Type: text/html, Size: 2000 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] shutdown-desktop: use poweroff for the Exec field in the shutdown.desktop
2014-01-15 11:38 ` Otavio Salvador
@ 2014-01-15 11:51 ` Otavio Salvador
2014-01-15 12:27 ` Richard Purdie
0 siblings, 1 reply; 5+ messages in thread
From: Otavio Salvador @ 2014-01-15 11:51 UTC (permalink / raw)
To: Chen Qi; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 346 bytes --]
On Wed, Jan 15, 2014 at 9:38 AM, Otavio Salvador <otavio@ossystems.com.br>wrote:
> RB_HATL_SYSTEM
typo in the commit log :) (Spot by Mario)
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
[-- Attachment #2: Type: text/html, Size: 799 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] shutdown-desktop: use poweroff for the Exec field in the shutdown.desktop
2014-01-15 11:51 ` Otavio Salvador
@ 2014-01-15 12:27 ` Richard Purdie
0 siblings, 0 replies; 5+ messages in thread
From: Richard Purdie @ 2014-01-15 12:27 UTC (permalink / raw)
To: Otavio Salvador; +Cc: Patches and discussions about the oe-core layer
On Wed, 2014-01-15 at 09:51 -0200, Otavio Salvador wrote:
>
> On Wed, Jan 15, 2014 at 9:38 AM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
> RB_HATL_SYSTEM
>
> typo in the commit log :) (Spot by Mario)
>
I fixed this up as I merged it.
Cheers,
Richard
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-01-15 12:28 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-15 7:10 [PATCH 0/1] shutdown-desktop: use poweroff for the Exec field in the shutdown.desktop Chen Qi
2014-01-15 7:10 ` [PATCH 1/1] " Chen Qi
2014-01-15 11:38 ` Otavio Salvador
2014-01-15 11:51 ` Otavio Salvador
2014-01-15 12:27 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox