From 9d31ef0b1acba3f4f66ceaf227f81ad14f3d92784e91901270650c57e5a041b1 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 15 May 2013 06:50:16 +0000 Subject: [PATCH 1/2] Accepting request 175577 from home:fcrozat:branches:Base:System - Add configure flags to ensure boot.local/halt.local are run on startup/shutdown. OBS-URL: https://build.opensuse.org/request/show/175577 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=379 --- systemd-mini.changes | 6 ++++++ systemd-mini.spec | 2 ++ systemd.changes | 6 ++++++ systemd.spec | 2 ++ 4 files changed, 16 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index 18c65cef..f7157d80 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 14 14:22:05 UTC 2013 - fcrozat@suse.com + +- Add configure flags to ensure boot.local/halt.local are run on + startup/shutdown. + ------------------------------------------------------------------- Mon May 13 18:08:41 UTC 2013 - rmilasan@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 6407bfc8..72ac98e9 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -424,6 +424,8 @@ export V=1 --enable-split-usr \ --disable-static \ --with-firmware-path="%{_prefix}/lib/firmware:/lib/firmware" \ + --with-rc-local-script-path-start=/etc/init.d/boot.local \ + --with-rc-local-script-path-stop=/etc/init.d/halt.local \ CFLAGS="%{optflags}" make %{?_smp_mflags} diff --git a/systemd.changes b/systemd.changes index 18c65cef..f7157d80 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 14 14:22:05 UTC 2013 - fcrozat@suse.com + +- Add configure flags to ensure boot.local/halt.local are run on + startup/shutdown. + ------------------------------------------------------------------- Mon May 13 18:08:41 UTC 2013 - rmilasan@suse.com diff --git a/systemd.spec b/systemd.spec index 3f6814c5..180253b1 100644 --- a/systemd.spec +++ b/systemd.spec @@ -419,6 +419,8 @@ export V=1 --enable-split-usr \ --disable-static \ --with-firmware-path="%{_prefix}/lib/firmware:/lib/firmware" \ + --with-rc-local-script-path-start=/etc/init.d/boot.local \ + --with-rc-local-script-path-stop=/etc/init.d/halt.local \ CFLAGS="%{optflags}" make %{?_smp_mflags} From 5404212e9d8c21f98e8e4cc418ac0592f74c503576c32438ae30929113b83095 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 15 May 2013 14:09:16 +0000 Subject: [PATCH 2/2] Accepting request 175744 from home:fcrozat:branches:Base:System - Update handle-SYSTEMCTL_OPTIONS-environment-variable.patch: don't free variable whose content is still be used (bnc#819970). OBS-URL: https://build.opensuse.org/request/show/175744 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=380 --- handle-SYSTEMCTL_OPTIONS-environment-variable.patch | 2 +- systemd-mini.changes | 6 ++++++ systemd.changes | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/handle-SYSTEMCTL_OPTIONS-environment-variable.patch b/handle-SYSTEMCTL_OPTIONS-environment-variable.patch index 1ed955b9..f139b0fb 100644 --- a/handle-SYSTEMCTL_OPTIONS-environment-variable.patch +++ b/handle-SYSTEMCTL_OPTIONS-environment-variable.patch @@ -22,7 +22,7 @@ index 84ce87c..cceafc9 100644 + + if (*parsed_systemctl_options && **parsed_systemctl_options) { + char **k,**a; -+ _cleanup_strv_free_ char **new_argv = new(char*, strv_length(argv) + strv_length(parsed_systemctl_options) + 1); ++ char **new_argv = new(char*, strv_length(argv) + strv_length(parsed_systemctl_options) + 1); + new_argv[0] = strdup(argv[0]); + for (k = new_argv+1, a = parsed_systemctl_options; *a; k++, a++) { + *k = strdup(*a); diff --git a/systemd-mini.changes b/systemd-mini.changes index f7157d80..085a2d34 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 15 13:02:05 UTC 2013 - fcrozat@suse.com + +- Update handle-SYSTEMCTL_OPTIONS-environment-variable.patch: don't + free variable whose content is still be used (bnc#819970). + ------------------------------------------------------------------- Tue May 14 14:22:05 UTC 2013 - fcrozat@suse.com diff --git a/systemd.changes b/systemd.changes index f7157d80..085a2d34 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 15 13:02:05 UTC 2013 - fcrozat@suse.com + +- Update handle-SYSTEMCTL_OPTIONS-environment-variable.patch: don't + free variable whose content is still be used (bnc#819970). + ------------------------------------------------------------------- Tue May 14 14:22:05 UTC 2013 - fcrozat@suse.com