From f9c02d53b7413892234b0afa1a3e64df66072865 Mon Sep 17 00:00:00 2001 From: Gary Edgar Date: Tue, 3 Dec 2019 08:19:07 -0800 Subject: [PATCH 1/2] bootstrap.sh: add back etdctl symlink Signed-off-by: Gary Edgar --- bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap.sh b/bootstrap.sh index 1d32620f63a..e1b4920e17c 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -234,6 +234,7 @@ function install_etcd() { fi rm "$file" ln -snf "$dist/etcd-${version}-${platform}-${target}/etcd" "$VTROOT/bin/etcd" + ln -snf "$dist/etcd-${version}-${platform}-amd64/etcdctl" "$VTROOT/bin/etcdctl" } which etcd || install_dep "etcd" "v3.3.10" "$VTROOT/dist/etcd" install_etcd From dc4ef6fd1ddb6a138598ad8c1d9e52e2110ed884 Mon Sep 17 00:00:00 2001 From: Gary Edgar Date: Tue, 3 Dec 2019 08:32:16 -0800 Subject: [PATCH 2/2] bootstrap.sh: remove amd64 hardcoding Signed-off-by: Gary Edgar --- bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index e1b4920e17c..a5f73105d4a 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -234,7 +234,7 @@ function install_etcd() { fi rm "$file" ln -snf "$dist/etcd-${version}-${platform}-${target}/etcd" "$VTROOT/bin/etcd" - ln -snf "$dist/etcd-${version}-${platform}-amd64/etcdctl" "$VTROOT/bin/etcdctl" + ln -snf "$dist/etcd-${version}-${platform}-${target}/etcdctl" "$VTROOT/bin/etcdctl" } which etcd || install_dep "etcd" "v3.3.10" "$VTROOT/dist/etcd" install_etcd