diff --git a/0048-systemctl-fix-argument-handling-when-invoked-as-shut.patch b/0048-systemctl-fix-argument-handling-when-invoked-as-shut.patch new file mode 100644 index 0000000..804ea0a --- /dev/null +++ b/0048-systemctl-fix-argument-handling-when-invoked-as-shut.patch @@ -0,0 +1,35 @@ +From 75836b9d2071aab978ee78d7d797126a18a32052 Mon Sep 17 00:00:00 2001 +From: Jan Synacek +Date: Mon, 15 Dec 2014 10:39:00 +0100 +Subject: [PATCH 1/2] systemctl: fix argument handling when invoked as + "shutdown" + +--- + src/systemctl/systemctl.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c +index 649fb5c..4c4648f 100644 +--- a/src/systemctl/systemctl.c ++++ b/src/systemctl/systemctl.c +@@ -6926,7 +6926,7 @@ static int shutdown_parse_argv(int argc, char *argv[]) { + assert(argc >= 0); + assert(argv); + +- while ((c = getopt_long(argc, argv, "HPrhkt:afFc", options, NULL)) >= 0) ++ while ((c = getopt_long(argc, argv, "HPrhkKt:afFc", options, NULL)) >= 0) + switch (c) { + + case ARG_HELP: +@@ -6967,6 +6967,8 @@ static int shutdown_parse_argv(int argc, char *argv[]) { + + case 't': + case 'a': ++ case 'f': ++ case 'F': + /* Compatibility nops */ + break; + +-- +2.2.0 + diff --git a/systemd.spec b/systemd.spec index af5145f..6b07aca 100644 --- a/systemd.spec +++ b/systemd.spec @@ -88,6 +88,7 @@ Patch0044: 0044-systemctl-when-invokes-as-reboot-f-sync.patch Patch0045: 0045-shared-create-files-even-if-the-SELinux-policy-has-n.patch Patch0046: 0046-shutdown-fix-arguments-to-run-initramfs-shutdown.patch Patch0047: 0047-login-rerun-vconsole-setup-when-switching-from-vgaco.patch +Patch0048: 0048-systemctl-fix-argument-handling-when-invoked-as-shut.patch Patch0996: Accept-StartTimeout-options-for-compatibility.patch @@ -879,6 +880,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd %{_datadir}/systemd/gatewayd %changelog +* Tue Dec 16 2014 Jan Synáček - 216-13 +- [abrt] systemd: log_assert_failed_unreachable(): systemctl killed by SIGABRT (#1173100) + * Mon Dec 15 2014 Zbigniew Jędrzejewski-Szmek - 216-13 - Require grubby (#1173919).