From 60534597e0111bb15fa0e4780d6b12a31d6120e9 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Wed, 9 Nov 2022 14:51:23 -0700
Subject: [PATCH] wait for network online before launching init (#1930)

---
 backend/embassy-init.service    | 4 ++--
 backend/src/bin/embassy-init.rs | 2 +-
 build/lib/scripts/postinst      | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/backend/embassy-init.service b/backend/embassy-init.service
index e7753b63c..b1420ad71 100644
--- a/backend/embassy-init.service
+++ b/backend/embassy-init.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Embassy Init
-After=network.target
-Requires=network.target
+After=network-online.target
+Requires=network-online.target
 Wants=avahi-daemon.service tor.service
 
 [Service]
diff --git a/backend/src/bin/embassy-init.rs b/backend/src/bin/embassy-init.rs
index 6484afbe9..5684b1817 100644
--- a/backend/src/bin/embassy-init.rs
+++ b/backend/src/bin/embassy-init.rs
@@ -32,7 +32,7 @@ async fn setup_or_init(cfg_path: Option<PathBuf>) -> Result<(), Error> {
 
         let ctx = InstallContext::init(cfg_path).await?;
 
-        let embassy_ip = dbg!(get_current_ip(ctx.ethernet_interface.to_owned()).await?);
+        let embassy_ip = get_current_ip(ctx.ethernet_interface.to_owned()).await?;
         let embassy_ip_fqdn: ResourceFqdn = embassy_ip.parse()?;
         let embassy_fqdn: ResourceFqdn = "pureos.local".parse()?;
 
diff --git a/build/lib/scripts/postinst b/build/lib/scripts/postinst
index 24bf3a0fb..aaca2d0f2 100755
--- a/build/lib/scripts/postinst
+++ b/build/lib/scripts/postinst
@@ -43,6 +43,7 @@ dns=systemd-resolved
 managed=true
 EOF
 $SYSTEMCTL enable systemd-resolved.service
+$SYSTEMCTL enable systemd-networkd-wait-online.service
 $SYSTEMCTL disable wpa_supplicant.service
 
 $SYSTEMCTL disable postgresql.service