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 18c65cef..085a2d34 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +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 + +- 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..085a2d34 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +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 + +- 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}