Merge pull request #415 from polvi/coreos-environment

feat(setup-environment): add unit and script for environment manipulatio...
This commit is contained in:
polvi 2014-03-13 23:00:50 -07:00
commit 6631ffd726
3 changed files with 5 additions and 1 deletions

View File

@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~x86" KEYWORDS="~amd64 ~arm ~x86"
else else
CROS_WORKON_COMMIT="bdb72dcffba17d34aea6e6df7f64678bf6003147" CROS_WORKON_COMMIT="7c6fe6641171e1d07f038f31ed4120ab19ea2c49"
KEYWORDS="amd64 arm x86" KEYWORDS="amd64 arm x86"
fi fi

View File

@ -13,6 +13,10 @@ if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
sed -i -e '/^COREOS_PUBLIC_IPV4=/d' \
-e '/^COREOS_PRIVATE_IPV4=/d' \
"${ENV}"
# get public ip from metadata # get public ip from metadata
PUB_IP_URL=http://169.254.169.254/latest/meta-data/public-ipv4 PUB_IP_URL=http://169.254.169.254/latest/meta-data/public-ipv4
IP=$(/usr/bin/curl --fail -s "$PUB_IP_URL") IP=$(/usr/bin/curl --fail -s "$PUB_IP_URL")