973febb6a0
- fixed correct python checking, bz1715479 - fix unbound variables, issues #43 - fixed path to services state store - fixed file submit to local patch is called outside test harness - restore shell options in rlWatchdog, bz1713291 - correctly skip test version if there's no rpm source of it, bz1712495
50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
From 96c657ea8ddc84203f624872c18765ccd1467743 Mon Sep 17 00:00:00 2001
|
|
From: Dalibor Pospisil <dapospis@redhat.com>
|
|
Date: Mon, 3 Jun 2019 16:42:28 +0200
|
|
Subject: [PATCH 8/8] generate correct path to the services state store
|
|
|
|
---
|
|
src/infrastructure.sh | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/infrastructure.sh b/src/infrastructure.sh
|
|
index 1c97205..1294b7c 100644
|
|
--- a/src/infrastructure.sh
|
|
+++ b/src/infrastructure.sh
|
|
@@ -984,8 +984,6 @@ __INTERNAL_SYSTEMCTL() {
|
|
systemctl --no-pager "$@"
|
|
}
|
|
|
|
-__INTERNAL_SERVICES_LIST="$BEAKERLIB_DIR/services_list"
|
|
-
|
|
rlServiceStart() {
|
|
# at least one service has to be supplied
|
|
if [ $# -lt 1 ]; then
|
|
@@ -997,6 +995,7 @@ rlServiceStart() {
|
|
local failed=0
|
|
|
|
# create file to store list of services, if it doesn't already exist
|
|
+ local __INTERNAL_SERVICES_LIST="$BEAKERLIB_DIR/services_list"
|
|
touch $__INTERNAL_SERVICES_LIST
|
|
|
|
local service
|
|
@@ -1092,6 +1091,7 @@ rlServiceStop() {
|
|
local failed=0
|
|
|
|
# create file to store list of services, if it doesn't already exist
|
|
+ local __INTERNAL_SERVICES_LIST="$BEAKERLIB_DIR/services_list"
|
|
touch $__INTERNAL_SERVICES_LIST
|
|
|
|
local service
|
|
@@ -1173,6 +1173,7 @@ original state; thus zero is returned when everything is OK.
|
|
|
|
rlServiceRestore() {
|
|
# create file to store list of services, if it doesn't already exist
|
|
+ local __INTERNAL_SERVICES_LIST="$BEAKERLIB_DIR/services_list"
|
|
touch $__INTERNAL_SERVICES_LIST
|
|
|
|
if [ $# -lt 1 ]; then
|
|
--
|
|
2.21.0
|
|
|