From 279ef318e1f5eb30154c8baec5d8fa083561a917 Mon Sep 17 00:00:00 2001
From: Michael Chus <mike@mchus.pro>
Date: Thu, 5 Mar 2026 16:17:52 +0300
Subject: [PATCH] fix: genapkovl copy to /var/tmp, udhcpc background mode

---
 .DS_Store                                      | Bin 0 -> 6148 bytes
 iso/.DS_Store                                  | Bin 0 -> 6148 bytes
 iso/builder/build-debug.sh                     |   2 ++
 iso/builder/genapkovl-bee_debug.sh             |   2 +-
 iso/overlay-debug/usr/local/bin/bee-network.sh |  11 ++++-------
 5 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 iso/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..114b1c909bb756ffbcf0798314b46163559a1b46
GIT binary patch
literal 6148
zcmeHKPfNov6i?iA8AI4X(PO~t!2JU!UP_%`z=|GJW^0EQYctl)9>$<o{X%{dKacMv
zDLCB0lZbl{lHbewlO{iClE)b1?kwyu)?|zcXowt@6@uoKt_>Sp0pvJGItgMG!00`g
zSl?d<TziE@EM+Rlzpg)y(yZP7;2V|d=2lJAL_^$qk1F>vKbxhlKfT7$g;H@)>V9w;
zjq_1+=Ts$`A0^|dPKd%Wgxp+3NvLvH&5|(Hxt?)|x~Pwud-Hkks3ixzMN7^*-F~+v
zj|ct5qAqq14o}WUPw{i2UJaWZ$kwuLv4l5J>}JCBJ`P}U7-~%~-ZY6-@&J}{f-;ei
z7$63S0b*dC7_hg1XspwwX|KcpG4LY>@O+Ta5FLw!L49;Ur%M39Dwwr^j<p2lNQ;ie
z!XS7+xJd;xsoa(r+@ynD+BnBzVbG*AZi^3Yzg!kCTz?(rmpYtr#~}5@05P!40M@=B
zO}zil;Fnoh<m(XXhyh~YzcRq9LvQH9?(E(AZJ&78N@#b`P%y4Q1qAe^M*s})9NE`S
d<CmyIoMW*th_j$wrvuVMKode8G4Klvd;+5xP5b}=

literal 0
HcmV?d00001

diff --git a/iso/.DS_Store b/iso/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..cdc8eda77d0d917ed493938a3994ae7aca486ea1
GIT binary patch
literal 6148
zcmeH~Jr2S!425ml0g0s}V-^m;4I%_5-~tF3kvaf-j?VMXLSaS~dY0@jc51bKLsN^0
z?w;4J$RHw1xKTD1CZ@<c8RaRD>-};&kK@fsZi}Q9;Db!|bDN+7RDcRl0V+TRW~4wK
z<jd8Jo{5h_1*pJ06tM3@fg5YG1^v^3;3ELoqwI#Y&k|s<0$7tRhzd-j6^vH(F~sWL
z4wk&GCR;GtMRWMjytCRA1Jh_1El6Nm9Sl@}3QQE}A|LGhKfu4u|C1J`RDcTnnF8AH
zkNX{7D$mxB*R%R5tF~@%&@V@L`w2i|NAVi&hW%m-uqIm&6&Qa6Tm}Xz@KXg|EG7|!

literal 0
HcmV?d00001

diff --git a/iso/builder/build-debug.sh b/iso/builder/build-debug.sh
index 48252e9..59abaea 100644
--- a/iso/builder/build-debug.sh
+++ b/iso/builder/build-debug.sh
@@ -103,7 +103,9 @@ rm -rf /var/tmp/bee-iso-work
 
 # Run from /var/tmp to avoid git repo context conflicts and to ensure enough scratch space.
 # mkinitfs/update-kernel use TMPDIR for initramfs build; tmpfs /tmp is only ~1GB.
+# mkimage.sh sources genapkovl-*.sh from CWD (not from ~/.mkimage), so copy it here too.
 export TMPDIR=/var/tmp
+cp "${BUILDER_DIR}/genapkovl-bee_debug.sh" /var/tmp/
 cd /var/tmp
 sh /usr/share/aports/scripts/mkimage.sh \
     --tag "v${ALPINE_VERSION}" \
diff --git a/iso/builder/genapkovl-bee_debug.sh b/iso/builder/genapkovl-bee_debug.sh
index 962e32d..64b1ec8 100755
--- a/iso/builder/genapkovl-bee_debug.sh
+++ b/iso/builder/genapkovl-bee_debug.sh
@@ -85,7 +85,7 @@ mkdir -p "$tmp/etc/dropbear" "$tmp/etc/conf.d"
 # -R: auto-generate host keys if missing
 # no dependency on networking service — bee-network handles DHCP independently
 makefile root:root 0644 "$tmp/etc/conf.d/dropbear" <<EOF
-DROPBEAR_OPTS="-R"
+DROPBEAR_OPTS="-R -B"
 EOF
 
 
diff --git a/iso/overlay-debug/usr/local/bin/bee-network.sh b/iso/overlay-debug/usr/local/bin/bee-network.sh
index 2670b0d..03edc93 100644
--- a/iso/overlay-debug/usr/local/bin/bee-network.sh
+++ b/iso/overlay-debug/usr/local/bin/bee-network.sh
@@ -22,13 +22,10 @@ for iface in $interfaces; do
     log "bringing up $iface"
     ip link set "$iface" up 2>/dev/null || { log "WARN: could not bring up $iface"; continue; }
 
-    # DHCP: 3 retries, 5s timeout per try, exit without blocking if no offer
-    if udhcpc -i "$iface" -t 3 -T 5 -n -q 2>/dev/null; then
-        IP=$(ip -4 addr show "$iface" | awk '/inet /{print $2}' | head -1)
-        log "OK: $iface got $IP"
-    else
-        log "WARN: $iface — no DHCP offer"
-    fi
+    # DHCP: run in background (-b) so udhcpc persists and retries when cable is connected later.
+    # -t 0: unlimited retries, -T 3: 3s per attempt.
+    udhcpc -i "$iface" -b -t 0 -T 3 -q 2>/dev/null &
+    log "DHCP started for $iface (background, will retry until lease acquired)"
 done
 
 log "done"