From 084b93b6840e48aa554fa7a06d5d11382aad01b0 Mon Sep 17 00:00:00 2001
From: Matthias Wirth <matthias.wirth@gmail.com>
Date: Sun, 22 Dec 2024 13:30:14 +0000
Subject: [PATCH] dietpi: test quicker firstboot

---
 src/build_dist | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/build_dist b/src/build_dist
index 9be471cf..a0c64b51 100755
--- a/src/build_dist
+++ b/src/build_dist
@@ -144,6 +144,24 @@ EOF
     # reduce the timeout for acquiring a dhcp lease, this makes dietpi networking less painful (default 60s)
     echo "timeout 30;" >> "$MNT_DIR"/etc/dhcp/dhclient.conf
 
+    # make firstboot quicker
+    patch "$MNT_DIR"/var/lib/dietpi/services/dietpi-firstboot.bash <<FEO
+@@ -352,8 +352,9 @@ _EOF_
+                # - Configure enabled interfaces now, /etc/network/interfaces will be effective from next boot on
+                #       Failsafe: Bring up Ethernet, whenever WiFi is disabled or fails to be configured, e.g. due to wrong credentials
+                # shellcheck disable=SC2015
+-               (( $wifi_enabled )) && ifup "$iface_wlan"
+-               (( $ethernet_enabled )) && ifup "$iface_eth"
++               (( $wifi_enabled )) && ifup "$iface_wlan" &
++               (( $ethernet_enabled )) && ifup "$iface_eth" &
++               wait
+
+                # - Boot wait for network
+                /boot/dietpi/func/dietpi-set_software boot_wait_for_network "$(( ! $(grep -cm1 '^[[:blank:]]*AUTO_SETUP_BOOT_WAIT_FOR_NETWORK=0' /boot/dietpi.txt) ))"
+FEO
+
+
+
     sed -i "s/ADSB_RANDOM_PASSWORD/$ROOT_PWD/" "${DIR}/variants/dietpi/dietpi.txt"
     echo "AUTO_SETUP_SSH_PUBKEY=$SSH_PUB_KEY" >> "${DIR}/variants/dietpi/dietpi.txt"
     cp "${DIR}/variants/dietpi/dietpi.txt" "$MNT_DIR"/"$CONFIG_DIR"