- Upgrade to 4.1.1 - renamed patches 0002-Install-libraries-without-exec-permission.patch to 0001-Install-libraries-without-exec-permission.patch 0005-Remove-runlevel-4-from-init-scripts.patch to 0003-Remove-runlevel-4-from-init-scripts.patch 0006-create-pmlogger-and-pmie-logdirs-during-install.patch to 0004-create-pmlogger-and-pmie-logdirs-during-install.patch 0008-SUSE-fy-pmsnap-control-path.patch to 0005-SUSE-fy-pmsnap-control-path.patch 0009-pmsnap-control-var-www-srv-www.patch to 0006-pmsnap-control-var-www-srv-www.patch - obsolete (upstream) sysmacros.patch 0003-pcp-legacy-init-lsb.patch 0007-Honor-CFLAGS-in-qmake.patch - new 0002-Remove-CPAN-rpaths.patch 0003-pcp-legacy-init-lsb.patch 0007-Honor-CFLAGS-in-qmake.patch OBS-URL: https://build.opensuse.org/request/show/634471 OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=63
35 lines
922 B
Diff
35 lines
922 B
Diff
From 99d131530bdad67ea92eeeff85181500b5c03768 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
|
|
Date: Mon, 23 Feb 2015 16:52:38 +0100
|
|
Subject: [PATCH 5/6] SUSE-fy pmsnap control path
|
|
|
|
---
|
|
src/pmsnap/pmsnap.sh | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/pmsnap/pmsnap.sh b/src/pmsnap/pmsnap.sh
|
|
index 87434a5fbfb9..92be253313ea 100755
|
|
--- a/src/pmsnap/pmsnap.sh
|
|
+++ b/src/pmsnap/pmsnap.sh
|
|
@@ -26,7 +26,7 @@ prog=`basename $0`
|
|
|
|
LOCALHOST=`pmhostname`
|
|
CONFIGDIR=$PCP_VAR_DIR/config/pmsnap
|
|
-CONTROL=$CONFIGDIR/control
|
|
+CONTROL=/etc/pcp/pmsnap/control
|
|
[ -z "$PCP_PMSNAPCONTROL_PATH" ] || CONTROL="$PCP_PMSNAPCONTROL_PATH"
|
|
|
|
_usage()
|
|
@@ -179,7 +179,7 @@ then
|
|
fi
|
|
commonargs="$commonargs $@"
|
|
|
|
-CONTROL=$CONFIGDIR/control
|
|
+CONTROL=/etc/pcp/pmsnap/control
|
|
if [ ! -f "$CONTROL" ]
|
|
then
|
|
echo "$prog: Error: cannot find control file \"$CONTROL\""
|
|
--
|
|
2.18.0
|
|
|