diff options
| author | Ben Howard <ben.howard@canonical.com> | 2013-09-19 16:51:55 -0600 |
|---|---|---|
| committer | Ben Howard <ben.howard@canonical.com> | 2013-09-19 16:51:55 -0600 |
| commit | fc97491fef9780a03cca6b78b477cbf75856f46c (patch) | |
| tree | 3161cec6da16e0e9d5a0e3e295d9417afa5c234f | |
| parent | d1bad8880c2219b9d7a648169bbe7a0a27c03be2 (diff) | |
| parent | 266d12c5777d5fba97c374c33cb4f31d50e2d347 (diff) | |
| download | vyos-cloud-init-fc97491fef9780a03cca6b78b477cbf75856f46c.tar.gz vyos-cloud-init-fc97491fef9780a03cca6b78b477cbf75856f46c.zip | |
Merged in the latest changes.
| -rwxr-xr-x | tools/read-version | 4 | ||||
| -rw-r--r-- | upstart/cloud-init-nonet.conf | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/read-version b/tools/read-version index 3df0889b..599f52cd 100755 --- a/tools/read-version +++ b/tools/read-version @@ -25,8 +25,8 @@ if [ ! -e "$CHNG_LOG" ]; then fail "Unable to find 'ChangeLog' file located at '$CHNG_LOG'" fi -VERSION=$(sed -n '/^[0-9]\+[.][0-9]\+[.][0-9]\+:/ \ - {s/://; p; :a;n; ba; }' "$CHNG_LOG") && +VERSION=$(sed -n '/^[0-9]\+[.][0-9]\+[.][0-9]\+:/ {s/://; p; :a;n; ba; }' \ + "$CHNG_LOG") && [ -n "$VERSION" ] || fail "failed to get version from '$CHNG_LOG'" echo "$VERSION" diff --git a/upstart/cloud-init-nonet.conf b/upstart/cloud-init-nonet.conf index a94b1474..e8ebee96 100644 --- a/upstart/cloud-init-nonet.conf +++ b/upstart/cloud-init-nonet.conf @@ -14,7 +14,7 @@ script SLEEP_CHILD="" static_network_up() { - local emitted="/run/network/static-network-up-emitted" + local emitted="/run/network/static-network-up-emitted" # /run/network/static-network-up-emitted is written by # upstart (via /etc/network/if-up.d/upstart). its presense would # indicate that static-network-up has already fired. |