forked from pool/systemd
74bf6f2e1d
- Add patch getty-generator-with-serial-3270-tty.patch to avoid harmless error messages on not existing getty@3270 files - Replace systemd-big-endian-reply-matching.patch with upstream 0001-sd-bus-don-t-look-for-a-64bit-value-when-we-only-hav.patch to solve broken systemd communication with and over dbus (bnc#866732) - Readd patch 1008-add-msft-compability-rules.patch for older code base as 13.1 - Modify pre_checkin.sh to throw an error if a patch will be applied which modifies one of Makefile.am, Makefile.in, or configiure.ac as this breaks bootstrapping - Add second version of make-209-working-on-older-dist.patch to be able to apply for bootstrapping version - Don't require non-existing binutils-gold - Avoid file conflict between udev and systemd (bnc#868230) - Modify patch module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch to ignore if /etc/sysconfig/kernel does not exist (bnc#865834) - Add patch systemd-big-endian-reply-matching.patch make sure that systemd can talk with dbus-daemon even on big endian systems (bnc#866732) ----------------------------------------------------------------- - Due to previous reason, resurrect systemd-dbus-system-bus-address.patch - Removed pkgconfig(dbus-1) BuildRequires - with 209 and newer, itis only needed for quering default DBus directories, which we nowpass to configure. OBS-URL: https://build.opensuse.org/request/show/225960 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=178
126 lines
4.2 KiB
Diff
126 lines
4.2 KiB
Diff
From 7b8b1ca177a532a6673e5795af867b3631622391 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Fri, 7 Mar 2014 14:04:58 +0100
|
|
Subject: [PATCH] systemd: powerd initctl support
|
|
|
|
Old versions of powerd will be using the initctl fifo to signal
|
|
state changes. To maintain backward compability systemd should
|
|
be interpreting these messages, too.
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
src/initctl/initctl.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++-
|
|
1 file changed, 70 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
|
|
index 468df35..d4794a6 100644
|
|
--- a/src/initctl/initctl.c
|
|
+++ b/src/initctl/initctl.c
|
|
@@ -32,8 +32,11 @@
|
|
#include <sys/un.h>
|
|
#include <fcntl.h>
|
|
#include <ctype.h>
|
|
+#include <sys/reboot.h>
|
|
+#include <linux/reboot.h>
|
|
|
|
#include "sd-daemon.h"
|
|
+#include "sd-shutdown.h"
|
|
#include "sd-bus.h"
|
|
|
|
#include "util.h"
|
|
@@ -44,6 +47,7 @@
|
|
#include "bus-util.h"
|
|
#include "bus-error.h"
|
|
#include "def.h"
|
|
+#include "socket-util.h"
|
|
|
|
#define SERVER_FD_MAX 16
|
|
#define TIMEOUT_MSEC ((int) (DEFAULT_EXIT_USEC/USEC_PER_MSEC))
|
|
@@ -141,7 +145,53 @@ static void change_runlevel(Server *s, int runlevel) {
|
|
}
|
|
}
|
|
|
|
+static int send_shutdownd(unsigned delay, char mode, const char *message) {
|
|
+ usec_t t = now(CLOCK_REALTIME) + delay * USEC_PER_MINUTE;
|
|
+ struct sd_shutdown_command c = {
|
|
+ .usec = t,
|
|
+ .mode = mode,
|
|
+ .dry_run = false,
|
|
+ .warn_wall = true,
|
|
+ };
|
|
+
|
|
+ union sockaddr_union sockaddr = {
|
|
+ .un.sun_family = AF_UNIX,
|
|
+ .un.sun_path = "/run/systemd/shutdownd",
|
|
+ };
|
|
+
|
|
+ struct iovec iovec[2] = {{
|
|
+ .iov_base = (char*) &c,
|
|
+ .iov_len = offsetof(struct sd_shutdown_command, wall_message),
|
|
+ }};
|
|
+
|
|
+ struct msghdr msghdr = {
|
|
+ .msg_name = &sockaddr,
|
|
+ .msg_namelen = offsetof(struct sockaddr_un, sun_path)
|
|
+ + sizeof("/run/systemd/shutdownd") - 1,
|
|
+ .msg_iov = iovec,
|
|
+ .msg_iovlen = 1,
|
|
+ };
|
|
+
|
|
+ _cleanup_close_ int fd;
|
|
+
|
|
+ fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0);
|
|
+ if (fd < 0)
|
|
+ return -errno;
|
|
+
|
|
+ if (!isempty(message)) {
|
|
+ iovec[1].iov_base = (char*) message;
|
|
+ iovec[1].iov_len = strlen(message);
|
|
+ msghdr.msg_iovlen++;
|
|
+ }
|
|
+
|
|
+ if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0)
|
|
+ return -errno;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static void request_process(Server *s, const struct init_request *req) {
|
|
+ int r;
|
|
assert(s);
|
|
assert(req);
|
|
|
|
@@ -184,9 +234,28 @@ static void request_process(Server *s, const struct init_request *req) {
|
|
return;
|
|
|
|
case INIT_CMD_POWERFAIL:
|
|
+ r = send_shutdownd(2, SD_SHUTDOWN_POWEROFF,
|
|
+ "THE POWER IS FAILED! SYSTEM GOING DOWN! PLEASE LOG OFF NOW!");
|
|
+ if (r < 0) {
|
|
+ log_warning("Failed to talk to shutdownd, shutdown cancelled: %s", strerror(-r));
|
|
+ }
|
|
+ return;
|
|
case INIT_CMD_POWERFAILNOW:
|
|
+ r = send_shutdownd(0, SD_SHUTDOWN_POWEROFF,
|
|
+ "THE POWER IS FAILED! LOW BATTERY - EMERGENCY SYSTEM SHUTDOWN!");
|
|
+ if (r < 0) {
|
|
+ log_warning("Failed to talk to shutdownd, proceeding with immediate shutdown: %s", strerror(-r));
|
|
+ reboot(RB_ENABLE_CAD);
|
|
+ reboot(RB_POWER_OFF);
|
|
+ }
|
|
+ return;
|
|
+
|
|
case INIT_CMD_POWEROK:
|
|
- log_warning("Received UPS/power initctl request. This is not implemented in systemd. Upgrade your UPS daemon!");
|
|
+ r = send_shutdownd(0, SD_SHUTDOWN_NONE,
|
|
+ "THE POWER IS BACK");
|
|
+ if (r < 0) {
|
|
+ log_warning("Failed to talk to shutdownd, proceeding with shutdown: %s", strerror(-r));
|
|
+ }
|
|
return;
|
|
|
|
case INIT_CMD_CHANGECONS:
|
|
--
|
|
1.8.1.4
|
|
|