jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 13:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

S40network: fix /etc/network/interfaces location

Browse Source
This commit is contained in:
Calin Crisan 2019-12-18 23:58:09 +02:00
parent 15c07e362e
commit 65eca2e487
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
board/common/overlay/etc/init.d/S40network
View File

@ -63,7 +63,7 @@ watch_ip() {
start_lo() { start_lo() {
if [[ -r ${INTERFACES_CONF} ]] && grep -q "^iface lo" ${INTERFACES_CONF}; then if [[ -r ${INTERFACES_CONF} ]] && grep -q "^iface lo" ${INTERFACES_CONF}; then
ifup lo 2>&1 | logger -t network ifup -i ${INTERFACES_CONF} lo 2>&1 | logger -t network
else else
ifconfig lo up ifconfig lo up
fi fi
@ -86,7 +86,7 @@ start_wlan() {
fi fi
if [[ -r ${INTERFACES_CONF} ]] && grep -q "^iface ${OS_WLAN}" ${INTERFACES_CONF}; then if [[ -r ${INTERFACES_CONF} ]] && grep -q "^iface ${OS_WLAN}" ${INTERFACES_CONF}; then
ifup ${OS_WLAN} 2>&1 | logger -t network ifup -i ${INTERFACES_CONF} ${OS_WLAN} 2>&1 | logger -t network
test ${PIPESTATUS[0]} == 0 && msg_done || msg_fail test ${PIPESTATUS[0]} == 0 && msg_done || msg_fail
else else
if [[ -n "${STATIC_IP}" ]]; then if [[ -n "${STATIC_IP}" ]]; then
@ -150,7 +150,7 @@ start_eth() {
fi fi
if [[ -r ${INTERFACES_CONF} ]] && grep -q "^iface ${OS_ETH}" ${INTERFACES_CONF}; then if [[ -r ${INTERFACES_CONF} ]] && grep -q "^iface ${OS_ETH}" ${INTERFACES_CONF}; then
ifup ${OS_ETH} 2>&1 | logger -t network ifup -i ${INTERFACES_CONF} ${OS_ETH} 2>&1 | logger -t network
test ${PIPESTATUS[0]} == 0 && msg_done || msg_fail test ${PIPESTATUS[0]} == 0 && msg_done || msg_fail
else else
if [[ -n "${STATIC_IP}" ]]; then if [[ -n "${STATIC_IP}" ]]; then
@ -200,7 +200,7 @@ start() {
if [[ -r ${INTERFACES_CONF} ]]; then if [[ -r ${INTERFACES_CONF} ]]; then
# ifup doesn't set the DNS server, so we have to set it manually # ifup doesn't set the DNS server, so we have to set it manually
STATIC_DNS=$(cat /etc/network/interfaces | grep dns-nameserver | tr -s ' ' | cut -d ' ' -f 3 | head -n 11) STATIC_DNS=$(cat ${INTERFACES_CONF} | grep dns-nameserver | tr -s ' ' | cut -d ' ' -f 3 | head -n 11)
if [[ -n "${STATIC_DNS}" ]]; then if [[ -n "${STATIC_DNS}" ]]; then
msg_begin "Setting static DNS server to ${STATIC_DNS}" msg_begin "Setting static DNS server to ${STATIC_DNS}"
echo "nameserver ${STATIC_DNS}" > /etc/resolv.conf echo "nameserver ${STATIC_DNS}" > /etc/resolv.conf
@ -223,7 +223,9 @@ start() {
stop() { stop() {
msg_begin "Stopping network" msg_begin "Stopping network"
ifdown -a 2>&1 | logger -t network if [[ -r ${INTERFACES_CONF} ]]; then
ifdown -i ${INTERFACES_CONF} -a 2>&1 | logger -t network
fi
ps | grep S40network | grep -v $$ | grep -v grep | tr -s ' ' | sed -e 's/^\s//' | cut -d ' ' -f 1 | xargs -r kill ps | grep S40network | grep -v $$ | grep -v grep | tr -s ' ' | sed -e 's/^\s//' | cut -d ' ' -f 1 | xargs -r kill
killall dhclient &>/dev/null killall dhclient &>/dev/null
msg_done msg_done