diff -Nru systemd-198/debian/changelog systemd-198/debian/changelog --- systemd-198/debian/changelog 2013-04-12 05:44:27.000000000 +0100 +++ systemd-198/debian/changelog 2013-04-19 11:45:41.000000000 +0100 @@ -1,3 +1,10 @@ +systemd (198-0ubuntu11) UNRELEASED; urgency=low + + * Use the shutdown fallback for "poweroff.target" too; this is invoked by + org.freedesktop.login1.Manager.PowerOff + + -- Iain Lane Fri, 19 Apr 2013 11:44:12 +0100 + systemd (198-0ubuntu10) raring; urgency=low * debian/systemd-services.install: Don't install the D-BUS activation file diff -Nru systemd-198/debian/patches/0016-Add-poweroff-reboot-suspend-hibernate-fallback.patch systemd-198/debian/patches/0016-Add-poweroff-reboot-suspend-hibernate-fallback.patch --- systemd-198/debian/patches/0016-Add-poweroff-reboot-suspend-hibernate-fallback.patch 2013-03-26 10:04:28.000000000 +0000 +++ systemd-198/debian/patches/0016-Add-poweroff-reboot-suspend-hibernate-fallback.patch 2013-04-19 11:46:51.000000000 +0100 @@ -10,11 +10,11 @@ src/login/logind-dbus.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) -diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c -index 4ae8362..2105e6f 100644 +Index: b/src/login/logind-dbus.c +=================================================================== --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c -@@ -1035,6 +1035,32 @@ static int bus_manager_log_shutdown( +@@ -1043,6 +1043,33 @@ q, NULL); } @@ -31,7 +31,8 @@ + cmd = "/usr/sbin/pm-hibernate"; + else if (streq(unit_name, "reboot.target")) + cmd = "/sbin/reboot"; -+ else if (streq(unit_name, "shutdown.target")) ++ else if (streq(unit_name, "shutdown.target") || ++ streq(unit_name, "poweroff.target")) + cmd = "/sbin/poweroff"; + else { + log_error("execute_shutdown_or_sleep_fallback: unknown unit name %s", unit_name); @@ -47,7 +48,7 @@ static int execute_shutdown_or_sleep( Manager *m, InhibitWhat w, -@@ -1064,8 +1090,23 @@ static int execute_shutdown_or_sleep( +@@ -1072,8 +1099,23 @@ DBUS_TYPE_STRING, &unit_name, DBUS_TYPE_STRING, &mode, DBUS_TYPE_INVALID); @@ -73,6 +74,3 @@ if (!dbus_message_get_args( reply, --- -1.8.1.2 -