From ca3179bd5f04d3d54f84abd27d85c99ce2dfb0f6b9baaeb1dca815fd76486d4d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 16 Sep 2014 10:25:16 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=776 --- ...to-change-the-default-target-without.patch | 51 +++++++++++++++++++ systemd-mini.changes | 22 ++++++++ systemd-mini.spec | 36 +++++++++++++ systemd.changes | 7 +++ systemd.spec | 3 ++ 5 files changed, 119 insertions(+) create mode 100644 0001-systemctl-allow-to-change-the-default-target-without.patch diff --git a/0001-systemctl-allow-to-change-the-default-target-without.patch b/0001-systemctl-allow-to-change-the-default-target-without.patch new file mode 100644 index 00000000..8e78fe01 --- /dev/null +++ b/0001-systemctl-allow-to-change-the-default-target-without.patch @@ -0,0 +1,51 @@ +From a1484a216e79da1fa7e2323095fb1b7203fb7a17 Mon Sep 17 00:00:00 2001 +From: Djalal Harouni +Date: Mon, 14 Apr 2014 01:07:52 +0100 +Subject: [PATCH] systemctl: allow to change the default target without the + --force switch + +Currently "systemctl set-default" will fail to change the default target +due to the 'default.target' being a symlink which is always the case. + +To work around this, the user must specify the "--force" switch to be +able to overwrite the existing symlink. + +This is clearly a regression that was introduced by commit 718db96199e +since it worked before without the "--force" switch and the man pages do +not mention that you need to specify it. It is expected that this is a +symlink. + +So just explicity set the force flag to make it work again. + +https://bugs.freedesktop.org/show_bug.cgi?id=76623 + +Reported-by: +--- + src/systemctl/systemctl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git src/systemctl/systemctl.c src/systemctl/systemctl.c +index ee0938f..1b381f7 100644 +--- src/systemctl/systemctl.c ++++ src/systemctl/systemctl.c +@@ -1968,7 +1968,7 @@ static int set_default(sd_bus *bus, char **args) { + return log_oom(); + + if (!bus || avoid_bus()) { +- r = unit_file_set_default(arg_scope, arg_root, unit, arg_force, &changes, &n_changes); ++ r = unit_file_set_default(arg_scope, arg_root, unit, true, &changes, &n_changes); + if (r < 0) { + log_error("Failed to set default target: %s", strerror(-r)); + return r; +@@ -1990,7 +1990,7 @@ static int set_default(sd_bus *bus, char **args) { + "SetDefaultTarget", + &error, + &reply, +- "sb", unit, arg_force); ++ "sb", unit, true); + if (r < 0) { + log_error("Failed to set default target: %s", bus_error_message(&error, -r)); + return r; +-- +1.7.9.2 + diff --git a/systemd-mini.changes b/systemd-mini.changes index 27603ed6..88954cc2 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Sep 16 10:21:02 UTC 2014 - werner@suse.de + +- Add upstream patches + 0001-systemctl-allow-to-change-the-default-target-without.patch + to allow to override default target without --force (bnc#896664) + +------------------------------------------------------------------- +Tue Sep 16 09:10:52 UTC 2014 - werner@suse.de + +- Add upstream patches for udev + 1068-udev-net_setup_link-export-the-.link-filename-applie.patch + 1069-rules-net-setup-link-preserve-ID_NET_LINK_FILE-and-I.patch + 1070-rules-net-setup-link-remove-stray-linebreak.patch + 1071-udev-import-the-full-db-on-MOVE-events-for-devices-w.patch + 1072-udev-netif_rename-don-t-log-to-kmsg.patch + 1073-udev-drop-print_kmsg.patch + 1074-udev-fix-copy-paste-error-in-log-message.patch + 1075-udev-timeout-increase-timeout.patch (bnc#889297) + 1076-udev-timeout-warn-after-a-third-of-the-timeout-befor.patch (bnc#889297) + 1077-udev-timeout-warn-after-a-third-of-the-timeout-befor.patch (bnc#889297) + ------------------------------------------------------------------- Sat Sep 13 13:35:33 UTC 2014 - rmilasan@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index e4537b69..8dbe4878 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -834,6 +834,8 @@ Patch401: 0001-initrd-parse-etc.service-ignore-return-code-of-daemo.patch Patch402: 0008-hwdb-Update-database-of-Bluetooth-company-identifier.patch # PATCH-FIX-UPSTREAM added at 2014/09/09 Patch403: 0009-hwdb-update.patch +# PATCH-FIX-UPSTREAM bnc896664: Allow to override default target without --force +Patch404: 0001-systemctl-allow-to-change-the-default-target-without.patch # UDEV PATCHES # ============ @@ -975,6 +977,26 @@ Patch1065: 1065-udev-bump-event-timeout-to-60-seconds.patch Patch1066: 1066-udev-add-compatibility-links-for-truncated-by-id-links.patch # PATCH-FIX-UPSTREAM 1067-udev-always-resolve-correctly-database-names-on-chan.patch (bnc#864745) Patch1067: 1067-udev-always-resolve-correctly-database-names-on-chan.patch +# PATCH-FIX-UPSTREAM 1068-udev-net_setup_link-export-the-.link-filename-applie.patch +Patch1068: 1068-udev-net_setup_link-export-the-.link-filename-applie.patch +# PATCH-FIX-UPSTREAM 1069-rules-net-setup-link-preserve-ID_NET_LINK_FILE-and-I.patch +Patch1069: 1069-rules-net-setup-link-preserve-ID_NET_LINK_FILE-and-I.patch +# PATCH-FIX-UPSTREAM 1070-rules-net-setup-link-remove-stray-linebreak.patch +Patch1070: 1070-rules-net-setup-link-remove-stray-linebreak.patch +# PATCH-FIX-UPSTREAM 1071-udev-import-the-full-db-on-MOVE-events-for-devices-w.patch +Patch1071: 1071-udev-import-the-full-db-on-MOVE-events-for-devices-w.patch +# PATCH-FIX-UPSTREAM 1072-udev-netif_rename-don-t-log-to-kmsg.patch +Patch1072: 1072-udev-netif_rename-don-t-log-to-kmsg.patch +# PATCH-FIX-UPSTREAM 1073-udev-drop-print_kmsg.patch +Patch1073: 1073-udev-drop-print_kmsg.patch +# PATCH-FIX-UPSTREAM 1074-udev-fix-copy-paste-error-in-log-message.patch +Patch1074: 1074-udev-fix-copy-paste-error-in-log-message.patch +# PATCH-FIX-UPSTREAM 1075-udev-timeout-increase-timeout.patch +Patch1075: 1075-udev-timeout-increase-timeout.patch +# PATCH-FIX-UPSTREAM 1076-udev-timeout-warn-after-a-third-of-the-timeout-befor.patch +Patch1076: 1076-udev-timeout-warn-after-a-third-of-the-timeout-befor.patch +# PATCH-FIX-UPSTREAM 1077-udev-timeout-warn-after-a-third-of-the-timeout-befor.patch +Patch1077: 1077-udev-timeout-warn-after-a-third-of-the-timeout-befor.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1539,6 +1561,7 @@ cp %{SOURCE7} m4/ %patch401 -p0 %patch402 -p0 %patch403 -p0 +%patch404 -p0 # udev patches %patch1001 -p1 @@ -1629,6 +1652,19 @@ cp %{SOURCE7} m4/ %patch1065 -p0 %patch1066 -p1 %patch1067 -p1 +%patch1068 -p0 +%patch1069 -p0 +%patch1070 -p0 +%patch1071 -p0 +%patch1072 -p0 +%patch1073 -p0 +%patch1074 -p0 +%patch1075 -p0 +%if %{with udevsettle} +%patch1076 -p0 +%else +%patch1077 -p0 +%endif # remove patch backups find -name '*.orig' -exec rm -f '{}' \+ diff --git a/systemd.changes b/systemd.changes index 46d3a404..88954cc2 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 16 10:21:02 UTC 2014 - werner@suse.de + +- Add upstream patches + 0001-systemctl-allow-to-change-the-default-target-without.patch + to allow to override default target without --force (bnc#896664) + ------------------------------------------------------------------- Tue Sep 16 09:10:52 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index adea623c..38a87d90 100644 --- a/systemd.spec +++ b/systemd.spec @@ -829,6 +829,8 @@ Patch401: 0001-initrd-parse-etc.service-ignore-return-code-of-daemo.patch Patch402: 0008-hwdb-Update-database-of-Bluetooth-company-identifier.patch # PATCH-FIX-UPSTREAM added at 2014/09/09 Patch403: 0009-hwdb-update.patch +# PATCH-FIX-UPSTREAM bnc896664: Allow to override default target without --force +Patch404: 0001-systemctl-allow-to-change-the-default-target-without.patch # UDEV PATCHES # ============ @@ -1554,6 +1556,7 @@ cp %{SOURCE7} m4/ %patch401 -p0 %patch402 -p0 %patch403 -p0 +%patch404 -p0 # udev patches %patch1001 -p1