Developing lightweight computation at the DSG edge

Commit 889d3e71 authored by Pau Escrich's avatar Pau Escrich
Browse files

Move wireless functions of qmp_autoconf into qmp_functions.sh (firstboot hooks...

Move wireless functions of qmp_autoconf into qmp_functions.sh (firstboot hooks must be executed before configuring wifi)
parent 00184ba3
...@@ -87,17 +87,10 @@ configure() { ...@@ -87,17 +87,10 @@ configure() {
log Using countrycode $country log Using countrycode $country
prepare_wifi prepare_wifi
. $QMP_DIR/qmp_wireless.sh
. $QMP_DIR/qmp_functions.sh . $QMP_DIR/qmp_functions.sh
log "[Configuring initial system]" log "[Configuring initial system]"
qmp_configure_wifi_initial
qmp_configure_wifi
log Reloading network
/etc/init.d/network reload
sleep 1
# Configuring networking and everything else
log "[Configuring full system]"
qmp_configure_initial qmp_configure_initial
log "[Configuring full system]"
qmp_configure qmp_configure
log Rebooting log Rebooting
......
#!/bin/sh #!/bin/sh
# requires ip ipv6calc awk sed grep
QMP_PATH="/etc/qmp" QMP_PATH="/etc/qmp"
SOURCE_FUNCTIONS=1 SOURCE_FUNCTIONS=1
...@@ -14,8 +15,7 @@ fi ...@@ -14,8 +15,7 @@ fi
[ -z "$SOURCE_GW" ] && . $QMP_PATH/qmp_gw.sh [ -z "$SOURCE_GW" ] && . $QMP_PATH/qmp_gw.sh
[ -z "$SOURCE_NET" ] && . $QMP_PATH/qmp_network.sh [ -z "$SOURCE_NET" ] && . $QMP_PATH/qmp_network.sh
[ -z "$SOURCE_SYS" ] && . $QMP_PATH/qmp_system.sh [ -z "$SOURCE_SYS" ] && . $QMP_PATH/qmp_system.sh
[ -z "$SOURCE_WIRELESS" ] && . $QMP_PATH/qmp_wireless.sh
# requires ip ipv6calc awk sed grep
qmp_get_llocal_for_dev() { qmp_get_llocal_for_dev() {
local dev=$1 local dev=$1
...@@ -834,6 +834,10 @@ qmp_check_force_internet() { ...@@ -834,6 +834,10 @@ qmp_check_force_internet() {
qmp_configure_initial() { qmp_configure_initial() {
qmp_hooks_exec firstboot qmp_hooks_exec firstboot
qmp_configure_wifi_initial
qmp_configure_wifi
/etc/init.d/network reload
sleep 1
qmp_configure_smart_network qmp_configure_smart_network
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment