From 0c14ca58c7405d1e629d00b3a33f3420927ec710 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Sun, 27 Oct 2019 10:56:16 -0700
Subject: [PATCH] Invoke on-reboot from cloud startup script to avoid racing
 with cron (#6579)

automerge
---
 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 ad3f226310..43fd4154b1 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
@@ -733,6 +737,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 7f9860b1ec..965716f458 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