Change simple-init to use a PATH variable
Changed simple-init to utilize a PATH variable in order to allow for glean to be executed in the event the operating system places glean in /usr/bin, such as what occurs on CentOS 7. Change-Id: Ibf95fcd7ca368595e8fb3473f25eb0a919726e39
This commit is contained in:
parent
d711b5fefb
commit
5487af6b2a
@ -17,6 +17,7 @@
|
|||||||
set -eu
|
set -eu
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
|
PATH=/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin
|
||||||
INTERFACE=${1:-} #optional, if not specified configure all available interfaces
|
INTERFACE=${1:-} #optional, if not specified configure all available interfaces
|
||||||
|
|
||||||
function config_exists() {
|
function config_exists() {
|
||||||
@ -38,7 +39,7 @@ if blkid -t LABEL="config-2" ; then
|
|||||||
# Mount config drive
|
# Mount config drive
|
||||||
mkdir -p /mnt/config
|
mkdir -p /mnt/config
|
||||||
mount -o mode=0700 $(blkid -t LABEL="config-2" | cut -d ':' -f 1) /mnt/config || true
|
mount -o mode=0700 $(blkid -t LABEL="config-2" | cut -d ':' -f 1) /mnt/config || true
|
||||||
/usr/local/bin/glean --ssh --skip-network
|
glean --ssh --skip-network
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f /usr/bin/dpkg ] ; then
|
if [ -f /usr/bin/dpkg ] ; then
|
||||||
@ -46,7 +47,7 @@ if [ -f /usr/bin/dpkg ] ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$INTERFACE" ]; then
|
if [ -n "$INTERFACE" ]; then
|
||||||
/usr/local/bin/glean --interface $INTERFACE
|
glean --interface $INTERFACE
|
||||||
else
|
else
|
||||||
/usr/local/bin/glean
|
glean
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user