From 877e5198212190c019000685ccc7677b1e0e57c6 Mon Sep 17 00:00:00 2001
From: Brian Picciano <mediocregopher@gmail.com>
Date: Tue, 15 Nov 2022 20:11:47 +0100
Subject: [PATCH] Apply garage layout prior to putting bootstrap

---
 entrypoint/src/cmd/entrypoint/daemon.go | 26 ++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/entrypoint/src/cmd/entrypoint/daemon.go b/entrypoint/src/cmd/entrypoint/daemon.go
index a7ac8a1..e9888dd 100644
--- a/entrypoint/src/cmd/entrypoint/daemon.go
+++ b/entrypoint/src/cmd/entrypoint/daemon.go
@@ -136,19 +136,6 @@ func runDaemonPmuxOnce(
 		return bootstrap.Bootstrap{}, fmt.Errorf("waiting for nebula/garage to start up: %w", err)
 	}
 
-	err = doOnce(ctx, func(ctx context.Context) error {
-		if err := hostBootstrap.PutGarageBoostrapHost(ctx); err != nil {
-			logger.Error(ctx, "updating host info in garage", err)
-			return err
-		}
-
-		return nil
-	})
-
-	if err != nil {
-		return bootstrap.Bootstrap{}, fmt.Errorf("updating host info in garage: %w", err)
-	}
-
 	if len(daemonConfig.Storage.Allocations) > 0 {
 
 		err := doOnce(ctx, func(ctx context.Context) error {
@@ -165,6 +152,19 @@ func runDaemonPmuxOnce(
 		}
 	}
 
+	err = doOnce(ctx, func(ctx context.Context) error {
+		if err := hostBootstrap.PutGarageBoostrapHost(ctx); err != nil {
+			logger.Error(ctx, "updating host info in garage", err)
+			return err
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		return bootstrap.Bootstrap{}, fmt.Errorf("updating host info in garage: %w", err)
+	}
+
 	ticker := time.NewTicker(3 * time.Minute)
 	defer ticker.Stop()