Commit Graph

5 Commits

Author SHA1 Message Date
Chen Qi 21b4548661 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>
2014-01-15 12:25:21 +00:00
Richard Purdie a22ee50865 Update after toplevel LICENSE file checksum change
(From OE-Core rev: bbd88aebcabbb19c27a7d752d4a5b8ad9ff9412e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-02 14:21:04 +00:00
Laurentiu Palcu 749fcafb08 shutdown-desktop: give entire path in Exec field
A normal user does not have /sbin in its PATH, by default, so having the
entire path here allows the correct execution when run as regular user.

[YOCTO #4345]

(From OE-Core rev: 8507335951dc5fb10ae40dc7f6850608c703ecc3)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-10 09:41:55 +01:00
Ross Burton 5d27c4968b shutdown-desktop: ensure the postinst script succeeds
When the hostname isn't qemuarm the grep fails so the postinst fails. Stop this
happening by explicitly evaluating true.

[YOCTO #3224]

(From OE-Core rev: 8848ea6793ddaab61c9dad250ec578d68d7d087d)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-04 14:07:51 +01:00
Paul Eggleton 54b8e84356 qemu-config: split out shutdown icon to its own recipe
Cleanly shutting down the machine from Sato is useful on other machines,
not all of which have a power button that otherwise enables this, so
make it not specific to qemu* and add it to task-core-x11-sato.

(From OE-Core rev: 738005f4713c0da7bc04582a41efa956efdb9cc0)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-04 12:53:07 +01:00