summaryrefslogtreecommitdiffstats
path: root/defaultenv
diff options
context:
space:
mode:
Diffstat (limited to 'defaultenv')
-rw-r--r--defaultenv/.gitignore1
-rw-r--r--defaultenv/defaultenv-2-base/boot/net2
-rw-r--r--defaultenv/defaultenv-2-base/init/automount4
3 files changed, 4 insertions, 3 deletions
diff --git a/defaultenv/.gitignore b/defaultenv/.gitignore
index e2ef3c4205..d14aa0f494 100644
--- a/defaultenv/.gitignore
+++ b/defaultenv/.gitignore
@@ -2,3 +2,4 @@
barebox_default_env*
barebox_zero_env
+defaultenv-2-ikconfig/
diff --git a/defaultenv/defaultenv-2-base/boot/net b/defaultenv/defaultenv-2-base/boot/net
index e79432eb27..98286ff5e0 100644
--- a/defaultenv/defaultenv-2-base/boot/net
+++ b/defaultenv/defaultenv-2-base/boot/net
@@ -3,7 +3,7 @@
path="/mnt/tftp"
# global.net.server and global.hostname may be set by DHCP, so trigger it first
-ifup -a
+ifup -a1
global.bootm.image="${path}/${global.user}-linux-${global.hostname}"
diff --git a/defaultenv/defaultenv-2-base/init/automount b/defaultenv/defaultenv-2-base/init/automount
index 0996cea04d..39e8234897 100644
--- a/defaultenv/defaultenv-2-base/init/automount
+++ b/defaultenv/defaultenv-2-base/init/automount
@@ -3,12 +3,12 @@
# automount tftp server
mkdir -p /mnt/tftp
-automount /mnt/tftp 'ifup -a && mount -t tftp $global.net.server /mnt/tftp'
+automount /mnt/tftp 'ifup -a1 && mount -t tftp $global.net.server /mnt/tftp'
# automount nfs server's nfsroot
mkdir -p /mnt/nfs
-automount /mnt/nfs 'ifup -a && mount -t nfs ${global.net.server}:/home/${global.user}/nfsroot/${global.hostname} /mnt/nfs'
+automount /mnt/nfs 'ifup -a1 && mount -t nfs ${global.net.server}:/home/${global.user}/nfsroot/${global.hostname} /mnt/nfs'
# FAT on usb disk example