Commit 227cfc90 authored by Roland Fehrenbacher's avatar Roland Fehrenbacher

Add patch to adjust absolute paths for some executables

(cherry picked from commit 63bdf90a4684579518c4a8d337257bfdc4a52ffc)
parent fbcf002a
......@@ -2,5 +2,5 @@ opa-ff (10.6.0.0.131+dfsg.1-ql.1) stable; urgency=low
* Initial Qlustar release
-- Roland Fehrenbacher <rf@q-leap.de> Mon, 29 Jan 2018 12:38:02 +0100
-- Roland Fehrenbacher <rf@q-leap.de> Sat, 10 Feb 2018 14:57:49 +0100
From: Roland Fehrenbacher <rf@q-leap.de>
Date: Sat, 10 Feb 2018 14:54:47 +0100
Subject: Adjust absolute paths for some executables
---
CommonInstall/util_driver.pl | 4 ++--
CommonInstall/util_init.pl | 2 +-
IbaTools/nodeverify/nodeverify.sh | 8 ++++----
IbaTools/opahfirev/opahfirev.sh | 2 +-
OpenIb_Host/LINUX/opacapture.sh | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/CommonInstall/util_driver.pl b/CommonInstall/util_driver.pl
index 9ae14ae..9b4a54a 100755
--- a/CommonInstall/util_driver.pl
+++ b/CommonInstall/util_driver.pl
@@ -337,8 +337,8 @@ sub start_driver($$$$)
# provide a verbose message during install
sub check_pcie_link
{
- my $setpci = '/sbin/setpci';
- my $lspci = '/sbin/lspci';
+ my $setpci = '/usr/bin/setpci';
+ my $lspci = '/usr/bin/lspci';
if (open (PCI, "$lspci -d 15b3: -n|")) {
while(<PCI>) {
my $devinfo = $_;
diff --git a/CommonInstall/util_init.pl b/CommonInstall/util_init.pl
index 19791ad..ca5a632 100755
--- a/CommonInstall/util_init.pl
+++ b/CommonInstall/util_init.pl
@@ -95,7 +95,7 @@ my $DBG_FREE="release";
# Command paths
-my $LSPCI = "/sbin/lspci";
+my $LSPCI = "/usr/bin/lspci";
my $RPM="/bin/rpm";
# a few key commands to verify exist
diff --git a/IbaTools/nodeverify/nodeverify.sh b/IbaTools/nodeverify/nodeverify.sh
index d522cf9..1c1ce89 100755
--- a/IbaTools/nodeverify/nodeverify.sh
+++ b/IbaTools/nodeverify/nodeverify.sh
@@ -244,7 +244,7 @@ test_pcicfg()
failure=0
cd "${outdir}" || fail "Can't cd ${outdir}"
- lspci="${lspci:-/sbin/lspci}"
+ lspci="${lspci:-/usr/bin/lspci}"
[ ! -x "${lspci}" ] && fail "Can't find lspci"
# get OmniPath Intel stand-alone WFR HFI
@@ -312,7 +312,7 @@ test_pcispeed()
failure=0
cd "${outdir}" || fail "Can't cd ${outdir}"
- lspci="${lspci:-/sbin/lspci}"
+ lspci="${lspci:-/usr/bin/lspci}"
[ ! -x "${lspci}" ] && fail "Can't find lspci"
# get OmniPath Intel stand-alone WFR HFI
@@ -502,8 +502,8 @@ test_hfi_pkt()
date
cd "${outdir}" || fail "Can't cd ${outdir}"
- lspci="${lspci:-/sbin/lspci}"
- setpci="${setpci:-/sbin/setpci}"
+ lspci="${lspci:-/usr/bin/lspci}"
+ setpci="${setpci:-/usr/bin/setpci}"
[ ! -x "${lspci}" ] && fail "Can't find lspci"
[ ! -x "${setpci}" ] && fail "Can't find setpci"
diff --git a/IbaTools/opahfirev/opahfirev.sh b/IbaTools/opahfirev/opahfirev.sh
index 47dd24e..0c9bbf8 100755
--- a/IbaTools/opahfirev/opahfirev.sh
+++ b/IbaTools/opahfirev/opahfirev.sh
@@ -70,7 +70,7 @@ fi
BASEDIR=/sys/bus/pci/devices
-hfis=`/sbin/lspci -nn -D -d '8086:*' | egrep -e "24f[01]|Omni-Path" | grep -vi bridge | cut -d\ -f1`
+hfis=`/usr/bin/lspci -nn -D -d '8086:*' | egrep -e "24f[01]|Omni-Path" | grep -vi bridge | cut -d\ -f1`
if [ -z "$hfis" ]
then
diff --git a/OpenIb_Host/LINUX/opacapture.sh b/OpenIb_Host/LINUX/opacapture.sh
index ef364b7..80fe591 100755
--- a/OpenIb_Host/LINUX/opacapture.sh
+++ b/OpenIb_Host/LINUX/opacapture.sh
@@ -150,7 +150,7 @@ fi
tar -zcf /$dir/opa-fm-bins.tgz /usr/lib/opa-fm/runtime/ > /dev/null 2>&1
# Finding the PCI devices
-for fw in `/sbin/lspci -n | grep "8086:24f0"`
+for fw in `/usr/bin/lspci -n | grep "8086:24f0"`
do
# Just get the PCI info for now...
echo "$fw" >> /$dir/fw_info
0001-Add-support-for-debian-qlustar.patch
0002-Add-correct-version-links-for-libraries.patch
0003-Adjust-absolute-paths-for-some-executables.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment