From f1e9a944ef97549073372718629051aa65bd5757 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Sun, 27 Oct 2019 13:55:37 -0700
Subject: [PATCH] Invoke on-reboot from cloud startup script to avoid racing
 with cron (#6579) (#6580)

automerge

(cherry picked from commit 0c14ca58c7405d1e629d00b3a33f3420927ec710)
---
 net/gce.sh                | 6 ++++++
 net/remote/remote-node.sh | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/net/gce.sh b/net/gce.sh
index 84f083c387..22d972697a 100755
--- a/net/gce.sh
+++ b/net/gce.sh
@@ -662,6 +662,7 @@ EOF
 set -ex
 
 if [[ -f /solana-scratch/.instance-startup-complete ]]; then
+  echo reboot
   $(
     cd "$here"/scripts/
     if "$enableGpu"; then
@@ -672,6 +673,9 @@ if [[ -f /solana-scratch/.instance-startup-complete ]]; then
       cat mount-additional-disk.sh
     fi
   )
+  if [[ -x ~solana/solana/on-reboot ]]; then
+    sudo -u solana ~solana/solana/on-reboot
+  fi
 
   # Skip most setup on instance reboot
   exit 0
@@ -732,6 +736,8 @@ $(
 )
 
 cat > /etc/motd <<EOM
+See startup script log messages in /var/log/syslog for status:
+  $ sudo cat /var/log/syslog | egrep \\(startup-script\\|cloud-init\)
 $(printNetworkInfo)
 $(creationInfo)
 EOM
diff --git a/net/remote/remote-node.sh b/net/remote/remote-node.sh
index e21e771f89..b3d2136b1a 100755
--- a/net/remote/remote-node.sh
+++ b/net/remote/remote-node.sh
@@ -76,7 +76,6 @@ now=\$(date -u +"%Y-%m-%dT%H:%M:%SZ")
 ln -sfT validator.log.\$now validator.log
 EOF
 chmod +x ~/solana/on-reboot
-echo "@reboot ~/solana/on-reboot" | crontab -
 
 GPU_CUDA_OK=false
 GPU_FAIL_IF_NONE=false