From e8e09e906304dc39ac45c08ec5d6b97029e8f010 Mon Sep 17 00:00:00 2001
From: Michael Chus <mike@mchus.pro>
Date: Thu, 5 Mar 2026 22:59:28 +0300
Subject: [PATCH] fix: chmod +x in genapkovl to fix permissions regardless of
 git filemode on VM

- genapkovl now explicitly chmod +x init.d/* and usr/local/bin/* after cp
- add bee-net-restart command (short name, no .sh) and /etc/profile.d/bee.sh for PATH
- udhcpc: add & to ensure non-blocking even when DHCP responds immediately
- motd: short commands without paths

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 iso/builder/genapkovl-bee_debug.sh              | 10 ++++++++--
 iso/overlay-debug/etc/motd                      |  9 ++++-----
 iso/overlay-debug/etc/profile.d/bee.sh          |  1 +
 iso/overlay-debug/usr/local/bin/bee-net-restart |  8 ++++++++
 iso/overlay-debug/usr/local/bin/bee-network.sh  |  6 +++---
 5 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 iso/overlay-debug/etc/profile.d/bee.sh
 create mode 100644 iso/overlay-debug/usr/local/bin/bee-net-restart

diff --git a/iso/builder/genapkovl-bee_debug.sh b/iso/builder/genapkovl-bee_debug.sh
index 1378d42..b9702a4 100755
--- a/iso/builder/genapkovl-bee_debug.sh
+++ b/iso/builder/genapkovl-bee_debug.sh
@@ -70,10 +70,16 @@ rc_add dropbear default
 rc_add bee-nvidia default
 rc_add bee-audit-debug default
 
-if [ -d "$OVERLAY/etc" ]; then cp -r "$OVERLAY/etc/." "$tmp/etc/"; fi
+if [ -d "$OVERLAY/etc" ]; then
+    cp -r "$OVERLAY/etc/." "$tmp/etc/"
+    chmod +x "$tmp/etc/init.d/"* 2>/dev/null || true
+fi
 
 mkdir -p "$tmp/usr"
-if [ -d "$OVERLAY/usr" ]; then cp -r "$OVERLAY/usr/." "$tmp/usr/"; fi
+if [ -d "$OVERLAY/usr" ]; then
+    cp -r "$OVERLAY/usr/." "$tmp/usr/"
+    chmod +x "$tmp/usr/local/bin/"* 2>/dev/null || true
+fi
 
 if [ -d "$OVERLAY/root" ]; then
     mkdir -p "$tmp/root"
diff --git a/iso/overlay-debug/etc/motd b/iso/overlay-debug/etc/motd
index dd1cac8..5023e89 100644
--- a/iso/overlay-debug/etc/motd
+++ b/iso/overlay-debug/etc/motd
@@ -9,12 +9,11 @@
   Hardware Audit LiveCD — DEBUG MODE
   Build: %%BUILD_INFO%%
 
-  Audit result:  /var/log/bee-audit.json
-  Audit log:     /var/log/bee-audit.log
-  Network log:   /var/log/bee-network.log
+  Logs:          /var/log/bee-audit.json  /var/log/bee-network.log
 
-  Re-run audit:  /usr/local/bin/audit --output stdout | less
-  Check package: which dmidecode smartctl nvme ipmitool lspci
+  Re-run audit:  audit --output stdout | less
+  Restart net:   bee-net-restart
+  Check tools:   which dmidecode smartctl nvme ipmitool lspci
 
   SSH access:    key auth (developers) or bee/eeb (password fallback)
 
diff --git a/iso/overlay-debug/etc/profile.d/bee.sh b/iso/overlay-debug/etc/profile.d/bee.sh
new file mode 100644
index 0000000..6e41e8f
--- /dev/null
+++ b/iso/overlay-debug/etc/profile.d/bee.sh
@@ -0,0 +1 @@
+export PATH="$PATH:/usr/local/bin"
diff --git a/iso/overlay-debug/usr/local/bin/bee-net-restart b/iso/overlay-debug/usr/local/bin/bee-net-restart
new file mode 100644
index 0000000..5c9147c
--- /dev/null
+++ b/iso/overlay-debug/usr/local/bin/bee-net-restart
@@ -0,0 +1,8 @@
+#!/bin/sh
+# bee-net-restart.sh — bring up all physical interfaces via DHCP (manual re-run)
+
+for iface in $(ip -o link show | awk -F': ' '{print $2}' | grep -v '^lo$' | grep -vE '^(docker|virbr|veth|tun|tap|br-|bond|dummy)'); do
+    echo "[$iface] bringing up..."
+    ip link set "$iface" up 2>/dev/null
+    udhcpc -i "$iface" -t 5 -T 3
+done
diff --git a/iso/overlay-debug/usr/local/bin/bee-network.sh b/iso/overlay-debug/usr/local/bin/bee-network.sh
index 4d9f2d0..c1baa86 100644
--- a/iso/overlay-debug/usr/local/bin/bee-network.sh
+++ b/iso/overlay-debug/usr/local/bin/bee-network.sh
@@ -22,10 +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: run in background (-b) so udhcpc persists and retries when cable is connected later.
+    # DHCP in background: -b forks if no immediate lease, & ensures non-blocking always.
     # -t 0: unlimited retries, -T 3: 3s per attempt. No -q: stay running to renew lease.
-    udhcpc -i "$iface" -b -t 0 -T 3
-    log "DHCP started for $iface (background, will retry and renew lease)"
+    udhcpc -i "$iface" -b -t 0 -T 3 &
+    log "DHCP started for $iface (pid $!)"
 done
 
 log "done"