From acc3a3ef900ad92ccca57aeb5f7e446f8bd4745d Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 24 Nov 2017 08:44:24 +0100 Subject: net: environment: update automounts Instead of using "ifup ethx" use "ifup -a" which works with all network interfaces. Also replace "$ethx.serverip" with "$global.net.server". This makes the automount independent of the actual network interface. Remove all board specific /env/init/automount files which were only there to use eth1 instead of the previously hardcoded eth0. Signed-off-by: Sascha Hauer --- Documentation/user/automount.rst | 2 +- arch/arm/boards/afi-gf/defaultenv-gf/init/automount | 10 ---------- arch/arm/boards/technexion-pico-hobbit/Makefile | 1 - arch/arm/boards/technexion-pico-hobbit/board.c | 2 -- .../defaultenv-pico-hobbit/init/automount | 11 ----------- .../zii-imx6q-rdu2/defaultenv-rdu2/init/automount | 17 ----------------- defaultenv/defaultenv-2-base/init/automount | 4 ++-- 7 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 arch/arm/boards/afi-gf/defaultenv-gf/init/automount delete mode 100644 arch/arm/boards/technexion-pico-hobbit/defaultenv-pico-hobbit/init/automount delete mode 100644 arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/init/automount diff --git a/Documentation/user/automount.rst b/Documentation/user/automount.rst index a5e4313576..7de8261354 100644 --- a/Documentation/user/automount.rst +++ b/Documentation/user/automount.rst @@ -13,7 +13,7 @@ Typical usage is for accessing the TFTP server. To set up an automount for a TFTP server, the following is required:: mkdir -p /mnt/tftp - automount /mnt/tftp 'ifup eth0 && mount -t tftp $eth0.serverip /mnt/tftp' + automount /mnt/tftp 'ifup -a && mount -t tftp $global.net.server /mnt/tftp' This creates an automountpoint on ``/mnt/tftp``. Whenever this directory is accessed, the command ``ifup eth0 && mount -t tftp $eth0.serverip /mnt/tftp`` is executed. diff --git a/arch/arm/boards/afi-gf/defaultenv-gf/init/automount b/arch/arm/boards/afi-gf/defaultenv-gf/init/automount deleted file mode 100644 index 560bdb7975..0000000000 --- a/arch/arm/boards/afi-gf/defaultenv-gf/init/automount +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# automount tftp server based on $eth1.serverip - -mkdir -p /mnt/tftp -automount /mnt/tftp 'ifup eth1 && mount -t tftp $eth1.serverip /mnt/tftp' - -# eth0 is on the mezzanine board -mkdir -p /mnt/tftp-eth0 -automount /mnt/tftp-eth0 'ifup eth0 && mount -t tftp $eth0.serverip /mnt/tftp' diff --git a/arch/arm/boards/technexion-pico-hobbit/Makefile b/arch/arm/boards/technexion-pico-hobbit/Makefile index 02e17035a0..01c7a259e9 100644 --- a/arch/arm/boards/technexion-pico-hobbit/Makefile +++ b/arch/arm/boards/technexion-pico-hobbit/Makefile @@ -1,3 +1,2 @@ obj-y += board.o lwl-y += lowlevel.o -bbenv-y += defaultenv-pico-hobbit diff --git a/arch/arm/boards/technexion-pico-hobbit/board.c b/arch/arm/boards/technexion-pico-hobbit/board.c index d3109fc390..f52f827f46 100644 --- a/arch/arm/boards/technexion-pico-hobbit/board.c +++ b/arch/arm/boards/technexion-pico-hobbit/board.c @@ -56,8 +56,6 @@ static int pico_hobbit_device_init(void) barebox_set_hostname("pico-hobbit"); - defaultenv_append_directory(defaultenv_pico_hobbit); - return 0; } device_initcall(pico_hobbit_device_init); diff --git a/arch/arm/boards/technexion-pico-hobbit/defaultenv-pico-hobbit/init/automount b/arch/arm/boards/technexion-pico-hobbit/defaultenv-pico-hobbit/init/automount deleted file mode 100644 index fdcfa36045..0000000000 --- a/arch/arm/boards/technexion-pico-hobbit/defaultenv-pico-hobbit/init/automount +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -# automount tftp server based on $eth1.serverip - -mkdir -p /mnt/tftp -automount /mnt/tftp 'ifup eth1 && mount -t tftp $eth1.serverip /mnt/tftp' - -# automount nfs server's nfsroot - -mkdir -p /mnt/nfs -automount /mnt/nfs 'ifup eth1 && mount -t nfs ${eth1.serverip}:/home/${global.user}/nfsroot/${global.hostname} /mnt/nfs' diff --git a/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/init/automount b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/init/automount deleted file mode 100644 index 6c04eb48a1..0000000000 --- a/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/init/automount +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -# automount tftp server based on $eth0.serverip - -mkdir -p /mnt/tftp -automount /mnt/tftp 'ifup eth1 && mount -t tftp $eth1.serverip /mnt/tftp' - -# automount nfs server's nfsroot - -mkdir -p /mnt/nfs -automount /mnt/nfs 'ifup eth1 && mount -t nfs ${eth1.serverip}:/home/${global.user}/nfsroot/${global.hostname} /mnt/nfs' - - -# FAT on usb disk example - -#mkdir -p /mnt/fat -#automount -d /mnt/fat 'usb && [ -e /dev/disk0.0 ] && mount /dev/disk0.0 /mnt/fat' diff --git a/defaultenv/defaultenv-2-base/init/automount b/defaultenv/defaultenv-2-base/init/automount index 959b2c148e..5e0cb4d938 100644 --- a/defaultenv/defaultenv-2-base/init/automount +++ b/defaultenv/defaultenv-2-base/init/automount @@ -3,12 +3,12 @@ # automount tftp server based on $eth0.serverip mkdir -p /mnt/tftp -automount /mnt/tftp 'ifup eth0 && mount -t tftp $eth0.serverip /mnt/tftp' +automount /mnt/tftp 'ifup -a && mount -t tftp $global.net.server /mnt/tftp' # automount nfs server's nfsroot mkdir -p /mnt/nfs -automount /mnt/nfs 'ifup eth0 && mount -t nfs ${eth0.serverip}:/home/${global.user}/nfsroot/${global.hostname} /mnt/nfs' +automount /mnt/nfs 'ifup -a && mount -t nfs ${global.net.server}:/home/${global.user}/nfsroot/${global.hostname} /mnt/nfs' # FAT on usb disk example -- cgit v1.2.3