From 0f1ae840c9c4a556e24709d5573ca7bdb8fc75ec Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jonas.gorski@gmail.com>
Date: Fri, 12 Aug 2016 16:47:25 +0200
Subject: base-files: split out preinit interface config
Move preinit interface and ip config to its own function to allow
calling it from more than one place.
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
---
package/base-files/files/lib/preinit/10_indicate_preinit | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
(limited to 'package/base-files/files/lib')
diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit
index 717d35c..b9368d9 100644
--- a/package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -2,6 +2,13 @@
# Copyright (C) 2006 OpenWrt.org
# Copyright (C) 2010 Vertical Communications
+preinit_ip_config() {
+ grep -q "$1" /proc/net/dev || return
+
+ ip link set dev $1 up
+ ip -4 address add $pi_ip/$pi_netmask broadcast $pi_broadcast dev $1
+}
+
preinit_ip() {
# if the preinit interface isn't specified and ifname is set in
# preinit.arch use that interface
@@ -9,10 +16,9 @@ preinit_ip() {
pi_ifname=$ifname
fi
- [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && {
- ip link set dev $pi_ifname up
- ip -4 address add $pi_ip/$pi_netmask broadcast $pi_broadcast dev $pi_ifname
- }
+ if [ -n "$pi_ifname" ]; then
+ preinit_ip_config $pi_ifname
+ fi
}
preinit_ip_deconfig() {
--
cgit v1.1