Skip to content

External network template override #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thomotron wants to merge 6 commits into
base: MeshExtender2.0
Choose a base branch
from
Open

External network template override #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb6eeab
Move execution of network setup after disk mount
thomotron Oct 1, 2019
041a0cb
Add check for a custom network.template in /serval-var/
thomotron Oct 1, 2019
b99bd62
Add comments
thomotron Oct 1, 2019
d4a6514
Rename network setup script file in Makefile
thomotron Oct 1, 2019
36a42d3
Increment Makefile version
thomotron Oct 1, 2019
b609452
Use /dos/ instead of /serval-var/ for custom network templates
thomotron Oct 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions net/serval-mesh-extender/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=serval-mesh-extender
PKG_VERSION:=START.20180429.0810.50
PKG_RELEASE:=82
PKG_VERSION:=START.20191001.1654.1
PKG_RELEASE:=84

PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DEPENDS:= +libc
Expand Down Expand Up @@ -51,7 +51,7 @@ define Package/serval-mesh-extender/install
$(INSTALL_BIN) ./files/etc/profile $(1)/etc
$(INSTALL_DIR) $(1)/etc/rc.d
$(INSTALL_BIN) ./files/etc/rc.d/S13pre_wireless_setup $(1)/etc/rc.d
$(INSTALL_BIN) ./files/etc/rc.d/S15wireless_setup $(1)/etc/rc.d
$(INSTALL_BIN) ./files/etc/rc.d/S18wireless_setup $(1)/etc/rc.d
$(INSTALL_BIN) ./files/etc/rc.d/S17mountstuff $(1)/etc/rc.d
$(INSTALL_BIN) ./files/etc/rc.d/S47radioeeprom $(1)/etc/rc.d
$(INSTALL_BIN) ./files/etc/rc.d/S49servald $(1)/etc/rc.d
Expand Down
9 changes: 8 additions & 1 deletion ...extender/files/etc/rc.d/S15wireless_setup → ...extender/files/etc/rc.d/S18wireless_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,14 @@ meshE=`dd if=/dev/urandom bs=5 count=1 | hexdump -e '1/1 "%02X" ":" 1/1 "%02X" "

echo $meship $meshE $ap0E $ap1E $apip

sed -e s/MESHIP/$meship/g -e s/APIP/$apip/g -e s/MESHETHER/$meshE/g -e s/APETHER0/$ap0E/g -e s/APETHER1/$ap1E/g < /etc/config/network.template > /etc/config/network
# Determine whether to load our pre-defined template or a user-defined one
NETWORK_TEMPLATE="/etc/config/network.template"
if [ -e "/dos/network.template" ]; then
NETWORK_TEMPLATE="/dos/network.template"
fi

# Apply our variables to the template and write to /etc/config/network
sed -e s/MESHIP/$meship/g -e s/APIP/$apip/g -e s/MESHETHER/$meshE/g -e s/APETHER0/$ap0E/g -e s/APETHER1/$ap1E/g < $NETWORK_TEMPLATE > /etc/config/network

# If left hanging around can cause problems.
# (should be deleted when we fresh install, but this doesn't always seem to be the case)
Expand Down