summaryrefslogtreecommitdiffstats
path: root/core/rootfs/rootfs-stage31/data/inc/setup_network
diff options
context:
space:
mode:
authorSimon Rettberg2017-02-09 15:49:13 +0100
committerroot2017-02-09 15:49:13 +0100
commit6a9a8b6009469aa6eb0a65cfec9afedda14eaef1 (patch)
tree9aea0c7a25ab18a4dffe84a2819b782dbbf85ae3 /core/rootfs/rootfs-stage31/data/inc/setup_network
parent[pam] Add missing config file for key handling (DFS, cifs.upcall etc.) (diff)
downloadmltk-6a9a8b6009469aa6eb0a65cfec9afedda14eaef1.tar.gz
mltk-6a9a8b6009469aa6eb0a65cfec9afedda14eaef1.tar.xz
mltk-6a9a8b6009469aa6eb0a65cfec9afedda14eaef1.zip
[rootfs-stage31] Don't open debug shell if we're booting with splash screen
This probably means the end user booted the system, so we don't want them to have a way to open a root shell...
Diffstat (limited to 'core/rootfs/rootfs-stage31/data/inc/setup_network')
-rw-r--r--core/rootfs/rootfs-stage31/data/inc/setup_network12
1 files changed, 9 insertions, 3 deletions
diff --git a/core/rootfs/rootfs-stage31/data/inc/setup_network b/core/rootfs/rootfs-stage31/data/inc/setup_network
index 956df03c..0aa033b9 100644
--- a/core/rootfs/rootfs-stage31/data/inc/setup_network
+++ b/core/rootfs/rootfs-stage31/data/inc/setup_network
@@ -22,8 +22,13 @@ BRIDGE="br0"
mkdir -p "${FUTURE_ROOT}/etc/udev/rules.d"
-#IP_OUT=$(ip a | sed -r ':a;N;$!ba;s/: ([a-z0-9]+): /####\1####/g;s/ether ([a-f0-9:]+) /####\1####/g'| grep -E -o '####[^ ]+####' | sed 's/#//g' | grep -B 1 ':')
-IP_OUT=$(ip a | grep -B 1 "/ether" | sed -r '/^--$/d;$!N;s#^[0-9]+: ([a-z0-9\.:]+): .*?/ether ([0-9a-fA-Z:]+) .*$#\1==\2#')
+for i in 1 1 1 END; do
+ IP_OUT=$(ip a | grep -B 1 "/ether" | sed -r '/^--$/d;$!N;s#^[0-9]+: ([a-z0-9\.:]+): .*?/ether ([0-9a-fA-Z:]+) .*$#\1==\2#')
+ [ "x$i" == "xEND" ] && break
+ if ! echo "$IP_OUT" | grep -q -- "$MAC"; then
+ sleep "$i"
+ fi
+done
if ! echo "$IP_OUT" | grep -q -- "$MAC"; then
drop_shell "---
@@ -32,7 +37,8 @@ $(ip a)
$IP_OUT
---
-Boot interface $MAC not found in interface list. NIC driver missing?"
+Boot interface $MAC not found in interface list. NIC driver missing?
+Check output of dmesg for missing firmware (dmesg | less)"
:
fi