aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Steuck <syzkaller@nest.cx>2018-12-08 19:56:43 -0800
committerDmitry Vyukov <dvyukov@google.com>2018-12-09 08:55:19 +0100
commit979179d6d60b101ae19b73a8b2f4ac437d06a974 (patch)
tree960affe388995d4860d22b1257ef28770904677a
parentc7918378631992d874c99736272ed342d5d77b2c (diff)
tools/*openbsd*: use nc from base instead of curl from package
This worked fine for ci machine but gce workers have no packages.
-rwxr-xr-xtools/create-openbsd-gce-ci.sh9
-rwxr-xr-xtools/create-openbsd-vmm-worker.sh9
2 files changed, 12 insertions, 6 deletions
diff --git a/tools/create-openbsd-gce-ci.sh b/tools/create-openbsd-gce-ci.sh
index cc7d9c76a..71e4b76a6 100755
--- a/tools/create-openbsd-gce-ci.sh
+++ b/tools/create-openbsd-gce-ci.sh
@@ -48,12 +48,15 @@ EOF
cat >etc/rc.local <<EOF
(
- /usr/local/bin/curl -H "Metadata-Flavor: Google" \
- "http://metadata.google.internal/computeMetadata/v1/instance/hostname" \
- > /etc/myname.gce \
+ nc metadata.google.internal 80 <<EOF2 | tail -n1 > /etc/myname.gce \
&& echo >> /etc/myname.gce \
&& mv /etc/myname{.gce,} \
&& hostname \$(cat /etc/myname)
+GET /computeMetadata/v1/instance/hostname HTTP/1.0
+Host: metadata.google.internal
+Metadata-Flavor: Google
+
+EOF2
set -eux
echo "starting syz-ci"
diff --git a/tools/create-openbsd-vmm-worker.sh b/tools/create-openbsd-vmm-worker.sh
index 0a2965ec1..a67539104 100755
--- a/tools/create-openbsd-vmm-worker.sh
+++ b/tools/create-openbsd-vmm-worker.sh
@@ -52,12 +52,15 @@ EOF
cat >etc/rc.local <<EOF
(
- /usr/local/bin/curl -H "Metadata-Flavor: Google" \
- "http://metadata.google.internal/computeMetadata/v1/instance/hostname" \
- > /etc/myname.gce \
+ nc metadata.google.internal 80 <<EOF2 | tail -n1 > /etc/myname.gce \
&& echo >> /etc/myname.gce \
&& mv /etc/myname{.gce,} \
&& hostname \$(cat /etc/myname)
+GET /computeMetadata/v1/instance/hostname HTTP/1.0
+Host: metadata.google.internal
+Metadata-Flavor: Google
+
+EOF2
)
EOF