From 0cef0696d665b385706d9be7aad48afee2537775 Mon Sep 17 00:00:00 2001 From: Milind Changire Date: Tue, 12 Feb 2019 16:25:37 +0530 Subject: [PATCH 530/530] spec: fix lua script execution during install Explicit bash shell invocation in the os.execute() API is not required. Since the script starts with the #!/bin/sh hash-bang sequence, os.execute() successfully spawns and runs the script. Label: DOWNSTREAM ONLY BUG: 1410145 Change-Id: I7774380adb1c164f50145270e91c1d2c086cd9d4 Signed-off-by: Milind Changire Reviewed-on: https://code.engineering.redhat.com/gerrit/162774 Reviewed-by: Sunil Kumar Heggodu Gopala Acharya --- glusterfs.spec.in | 63 +++++++++++++------------------------------------------ 1 file changed, 15 insertions(+), 48 deletions(-) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 2680bec..89cd501 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -1640,10 +1640,7 @@ if [ $? -eq 0 ]; then fi ]] --- Since we run pretrans scripts only for RPMs built for a server build, --- we can now use os.tmpname() since it is available on RHEL6 and later --- platforms which are server platforms. -ok, how, val = os.execute("/bin/bash -c \"" .. script .. "\"") +ok, how, val = os.execute(script) if not (ok == 0) then error("Detected running glusterfs processes", ok) end @@ -1677,10 +1674,7 @@ if [ $? -eq 0 ]; then fi ]] --- Since we run pretrans scripts only for RPMs built for a server build, --- we can now use os.tmpname() since it is available on RHEL6 and later --- platforms which are server platforms. -ok, how, val = os.execute("/bin/bash -c \"" .. script .. "\"") +ok, how, val = os.execute(script) if not (ok == 0) then error("Detected running glusterfs processes", ok) end @@ -1714,10 +1708,7 @@ if [ $? -eq 0 ]; then fi ]] --- Since we run pretrans scripts only for RPMs built for a server build, --- we can now use os.tmpname() since it is available on RHEL6 and later --- platforms which are server platforms. -ok, how, val = os.execute("/bin/bash -c \"" .. script .. "\"") +ok, how, val = os.execute(script) if not (ok == 0) then error("Detected running glusterfs processes", ok) end @@ -1751,10 +1742,7 @@ if [ $? -eq 0 ]; then fi ]] --- Since we run pretrans scripts only for RPMs built for a server build, --- we can now use os.tmpname() since it is available on RHEL6 and later --- platforms which are server platforms. -ok, how, val = os.execute("/bin/bash -c \"" .. script .. "\"") +ok, how, val = os.execute(script) if not (ok == 0) then error("Detected running glusterfs processes", ok) end @@ -1788,10 +1776,7 @@ if [ $? -eq 0 ]; then fi ]] --- Since we run pretrans scripts only for RPMs built for a server build, --- we can now use os.tmpname() since it is available on RHEL6 and later --- platforms which are server platforms. -ok, how, val = os.execute("/bin/bash -c \"" .. script .. "\"") +ok, how, val = os.execute(script) if not (ok == 0) then error("Detected running glusterfs processes", ok) end @@ -1825,10 +1810,7 @@ if [ $? -eq 0 ]; then fi ]] --- Since we run pretrans scripts only for RPMs built for a server build, --- we can now use os.tmpname() since it is available on RHEL6 and later --- platforms which are server platforms. -ok, how, val = os.execute("/bin/bash -c \"" .. script .. "\"") +ok, how, val = os.execute(script) if not (ok == 0) then error("Detected running glusterfs processes", ok) end @@ -1862,10 +1844,7 @@ if [ $? -eq 0 ]; then fi ]] --- Since we run pretrans scripts only for RPMs built for a server build, --- we can now use os.tmpname() since it is available on RHEL6 and later --- platforms which are server platforms. -ok, how, val = os.execute("/bin/bash -c \"" .. script .. "\"") +ok, how, val = os.execute(script) if not (ok == 0) then error("Detected running glusterfs processes", ok) end @@ -1900,10 +1879,7 @@ if [ $? -eq 0 ]; then fi ]] --- Since we run pretrans scripts only for RPMs built for a server build, --- we can now use os.tmpname() since it is available on RHEL6 and later --- platforms which are server platforms. -ok, how, val = os.execute("/bin/bash -c \"" .. script .. "\"") +ok, how, val = os.execute(script) if not (ok == 0) then error("Detected running glusterfs processes", ok) end @@ -1938,10 +1914,7 @@ if [ $? -eq 0 ]; then fi ]] --- Since we run pretrans scripts only for RPMs built for a server build, --- we can now use os.tmpname() since it is available on RHEL6 and later --- platforms which are server platforms. -ok, how, val = os.execute("/bin/bash -c \"" .. script .. "\"") +ok, how, val = os.execute(script) if not (ok == 0) then error("Detected running glusterfs processes", ok) end @@ -1976,10 +1949,7 @@ if [ $? -eq 0 ]; then fi ]] --- Since we run pretrans scripts only for RPMs built for a server build, --- we can now use os.tmpname() since it is available on RHEL6 and later --- platforms which are server platforms. -ok, how, val = os.execute("/bin/bash -c \"" .. script .. "\"") +ok, how, val = os.execute(script) if not (ok == 0) then error("Detected running glusterfs processes", ok) end @@ -2015,10 +1985,7 @@ if [ $? -eq 0 ]; then fi ]] --- Since we run pretrans scripts only for RPMs built for a server build, --- we can now use os.tmpname() since it is available on RHEL6 and later --- platforms which are server platforms. -ok, how, val = os.execute("/bin/bash -c \"" .. script .. "\"") +ok, how, val = os.execute(script) if not (ok == 0) then error("Detected running glusterfs processes", ok) end @@ -2053,10 +2020,7 @@ if [ $? -eq 0 ]; then fi ]] --- Since we run pretrans scripts only for RPMs built for a server build, --- we can now use os.tmpname() since it is available on RHEL6 and later --- platforms which are server platforms. -ok, how, val = os.execute("/bin/bash -c \"" .. script .. "\"") +ok, how, val = os.execute(script) if not (ok == 0) then error("Detected running glusterfs processes", ok) end @@ -2113,6 +2077,9 @@ fi %endif %changelog +* Tue Feb 09 2019 Milind Changire +- Fix lua script execution during install (#1410145) + * Sat Feb 09 2019 Milind Changire - Avoid creation of temporary file in lua script during install (#1410145) -- 1.8.3.1