summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ehrhardt <christian.ehrhardt@canonical.com>2015-11-16 14:22:53 (GMT)
committerChristian Ehrhardt <christian.ehrhardt@canonical.com>2015-11-16 14:22:53 (GMT)
commitb5b9a5d95a9ee17fff1642f41c78e112a0aabbc4 (patch)
treecb45f2eac2465625e199ed40bd5ee31e83cac2ec
parent7e8a0c977ed0b36cd2058c308c72e28cb5d93849 (diff)
Add /usr/bin path to the init script environment.
To avoid potential issues with /usr not being mounted early we modifiy the current users of /usr/bin to /bin tools only. Fix #LP: 1516543
-rwxr-xr-xdebian/dpdk-init3
-rw-r--r--debian/dpdk.init2
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/dpdk-init b/debian/dpdk-init
index 106752b..6f4e1fc 100755
--- a/debian/dpdk-init
+++ b/debian/dpdk-init
@@ -26,7 +26,8 @@ DPDK_BIND="/sbin/dpdk_nic_bind"
# if there is already one, there is no need to create another.
#
hugetlbfs_mountpoint() {
- echo "$(cat /proc/mounts|grep hugetlbfs|head -1|cut -d" " -f2)"
+ echo "$(cat /proc/mounts|grep hugetlbfs|sed -n '1p' \
+ | sed -e 's/^ *[^ ]* //; s/ .*//g')"
}
mount_hugetlbfs() {
diff --git a/debian/dpdk.init b/debian/dpdk.init
index 1f1e4d7..7e080b4 100644
--- a/debian/dpdk.init
+++ b/debian/dpdk.init
@@ -11,7 +11,7 @@
set -e
-PATH="/sbin:/bin"
+PATH="/sbin:/bin:/usr/bin"
[ -d /lib/dpdk ] || exit 0