From 18e38ac6d543bc06c25c938b0094048ac2347297 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mar 18 2016 18:30:41 +0000 Subject: drop Requires(post): sed - Fork to execute systemctl calls Signed-off-by: Dennis Gilmore --- diff --git a/convert-to-edition.lua b/convert-to-edition.lua index d52a471..2a5b9d9 100644 --- a/convert-to-edition.lua +++ b/convert-to-edition.lua @@ -125,8 +125,17 @@ local function set_presets(edition, apply_presets) local presets = read_presets(target) local systemctl = "/usr/bin/systemctl" if posix.access(systemctl, "x") then - os.execute(systemctl, "preset", "-q", - table.unpack(presets)) + --fork off a systemctl call + local pid = assert(posix.fork()) + if pid == 0 then + -- Child + posix.exec(systemctl, "preset", "-q", table.unpack(presets)) + -- In case exec() fails + os.exit(17) + else + -- RPM + assert(posix.wait(pid)) + end end end end diff --git a/fedora-release.spec b/fedora-release.spec index d9ab8ce..6e12d45 100644 --- a/fedora-release.spec +++ b/fedora-release.spec @@ -5,7 +5,7 @@ Summary: Fedora release files Name: fedora-release Version: 25 -Release: 0.6 +Release: 0.7 License: MIT Group: System Environment/Base URL: http://fedoraproject.org @@ -333,6 +333,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %config %attr(0644,root,root) /usr/lib/os.release.d/presets/80-workstation.preset %changelog +* Fri Mar 18 2016 Dennis Gilmor - 25-0.7 +- drop Requires(post): sed +- Fork to execute systemctl calls + * Tue Mar 15 2016 Dennis Gilmore - 25-0.6 - Properly handle systemd presets in Lua scripts - enable opal-prd.service diff --git a/sources b/sources index 32416a9..20f58ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8370d436c9a73c29ab20ccb8f8666057 fedora-release-25.tar.bz2 +595909a703f39d7316528bfb090f7a15 fedora-release-25.tar.bz2