diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-31 12:04:23 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-30 12:45:46 +0200 |
| commit | d33909c5ed6567663ec4bc3593c57fa9c8634f40 (patch) | |
| tree | ff86067db2607f7d28068995ce006564a8801bb7 | |
| parent | 2ac974b5414efb1ea594f31b274bd14e79aa73f4 (diff) | |
| download | barebox-d33909c5ed6567663ec4bc3593c57fa9c8634f40.tar.gz barebox-d33909c5ed6567663ec4bc3593c57fa9c8634f40.tar.xz | |
defaultenv-2: mount tftp server specified in $eth0.serverip
This is always the tftp server specified in /env/network/eth0,
this could be either the one returned from a dhcp request or
a manually specified one, but in the end it's always the right
one.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | defaultenv-2/base/init/automount | 11 | ||||
| -rw-r--r-- | defaultenv-2/base/init/general | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/defaultenv-2/base/init/automount b/defaultenv-2/base/init/automount index 63099f9c38..7b533094ff 100644 --- a/defaultenv-2/base/init/automount +++ b/defaultenv-2/base/init/automount @@ -5,10 +5,10 @@ if [ "$1" = menu ]; then exit fi -# automount server returned from dhcp server +# automount tftp server based on $eth0.serverip -mkdir -p /mnt/tftp-dhcp -automount /mnt/tftp-dhcp 'ifup eth0 && mount $eth0.serverip tftp /mnt/tftp-dhcp' +mkdir -p /mnt/tftp +automount /mnt/tftp 'ifup eth0 && mount $eth0.serverip tftp /mnt/tftp' # automount nfs server example @@ -16,11 +16,6 @@ automount /mnt/tftp-dhcp 'ifup eth0 && mount $eth0.serverip tftp /mnt/tftp-dhcp' #mkdir -p /mnt/${nfshost} #automount /mnt/$nfshost "ifup eth0 && mount ${nfshost}:/tftpboot nfs /mnt/${nfshost}" -# static tftp server example - -#mkdir -p /mnt/tftp -#automount -d /mnt/tftp 'ifup eth0 && mount $serverip tftp /mnt/tftp' - # FAT on usb disk example #mkdir -p /mnt/fat diff --git a/defaultenv-2/base/init/general b/defaultenv-2/base/init/general index ad6c8600a0..2fea03d61b 100644 --- a/defaultenv-2/base/init/general +++ b/defaultenv-2/base/init/general @@ -15,4 +15,4 @@ global.autoboot_timeout=3 global.boot.default=net # default tftp path -global.tftp.path=/mnt/tftp-dhcp +global.tftp.path=/mnt/tftp |