sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Change simple-init to use a PATH variable"

Browse Source
This commit is contained in:
Jenkins 2015-06-26 02:32:56 +00:00 committed by Gerrit Code Review
commit 8fe0009534
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
elements/simple-init/install.d/simple-init.sh
View File

@ -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