diff options
author | Jonathan Bauer | 2015-04-07 17:43:23 +0200 |
---|---|---|
committer | Jonathan Bauer | 2015-04-07 17:43:23 +0200 |
commit | b1074927e6848d7370c6d4a1b11b7149d6660a77 (patch) | |
tree | 89dfef802d48522d297632cb77fe13825707ff3e /remote/rootfs/rootfs-stage31/data/init | |
parent | [pam-common-share] rudimentary nfs-support for common share (diff) | |
parent | [hdd-boot] michi's werk (diff) | |
download | tm-scripts-mergetest.tar.gz tm-scripts-mergetest.tar.xz tm-scripts-mergetest.zip |
Merge remote-tracking branch 'remotes/origin/test' into mergetestmergetest
Diffstat (limited to 'remote/rootfs/rootfs-stage31/data/init')
-rwxr-xr-x | remote/rootfs/rootfs-stage31/data/init | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init index 9daa6d58..d363db51 100755 --- a/remote/rootfs/rootfs-stage31/data/init +++ b/remote/rootfs/rootfs-stage31/data/init @@ -69,9 +69,18 @@ if [ $SPLASH -eq 0 ]; then [ $DEBUG -ge 1 ] && echo "4 4 1 7" > /proc/sys/kernel/printk || echo "1 1 0 1" >/proc/sys/kernel/printk fi -[ $DEBUG -ge 4 ] && drop_shell "Requested Debug Shell: before network." +case $HDD in +yes) + mkdir /boot + busybox mount /dev/$HDD_BOOT /boot +;; +esac -. "/inc/setup_network" || . "/inc/setup_network_retry" || drop_shell "Error setting up network" +[ $DEBUG -ge 4 ] && drop_shell "Requested Debug Shell: before network." +. "/inc/setup_network" +if [ "$?" -ne 0 -a "x$HDD" = "x" ]; then + . "/inc/setup_network_retry" || drop_shell "Error setting up network" +fi bench_event "NETWORK" "Network up and running" [ $DEBUG -ge 3 ] && drop_shell "Requested Debug Shell: after network/before configuring." |