Merge commit '33995b24737535a751326d4711330a9f96760cac' into dora

This commit is contained in:
Holger Hans Peter Freyther 2015-07-23 16:08:57 +02:00
commit 8de2d28267
7 changed files with 13 additions and 5 deletions

View File

@ -27,7 +27,6 @@ iface eth0.2000 inet static
netmask 255.255.255.0
network 192.168.0.0
post-up ip r add 10.6.1.0/24 via 192.168.0.1
post-up ip r add 5.9.81.48/32 via 192.168.0.1 metric 110
# VLAN 2001: Reserved for a future C-Band satellite modem
# attached to port 8 of the IES-3080

View File

@ -27,7 +27,6 @@ iface eth0.2000 inet static
netmask 255.255.255.0
network 192.168.0.0
post-up ip r add 10.6.1.0/24 via 192.168.0.1
post-up ip r add 5.9.81.48/32 via 192.168.0.1 metric 110
# VLAN 2001: Reserved for a future C-Band satellite modem
# attached to port 8 of the IES-3080

View File

@ -12,6 +12,7 @@ PR = "r0"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
B = "${S}"
CFLAGS += ""
LDFLAGS += ""

View File

@ -1,6 +1,6 @@
SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
FILESEXTRAPATHS_prepend := "${SYSMOCOM}/busybox-${SYSMOCOM_ORIG_PV}:${SYSMOCOM}/files:"
PRINC = "28"
PRINC = "30"
SRC_URI += "file://udhcpc-ntp.sh \
file://udhcpc-ntp.default \

View File

@ -1,6 +1,7 @@
#!/bin/sh
# udhcpc script edited by Tim Riker <Tim@Rikers.org>
# Added INSTALL_DEFAULT_ROUTE flag, by <info@sysmocom.de>
[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
@ -46,7 +47,7 @@ case "$1" in
/sbin/ifconfig $interface $ip $BROADCAST $NETMASK
fi
if [ -n "$router" ] ; then
if [ -n "$router" -a "$INSTALL_DEFAULT_ROUTE" != "no" ] ; then
if ! root_is_nfs ; then
if [ $have_bin_ip -eq 1 ]; then
while ip route del default dev $interface 2>/dev/null ; do

View File

@ -0,0 +1,5 @@
# Uncomment the following line, if udhcpc should not touch /etc/resolv.conf
STATIC_DNS="yes"
# Uncomment the following line if udhcpc should not install a default route
INSTALL_DEFAULT_ROUTE="no"

View File

@ -1,2 +1,5 @@
# Uncomment the following line, if udhcpc should not touch /etc/resolv.conf
# STATIC_DNS="yes"
#STATIC_DNS="yes"
# Uncomment the following line if udhcpc should not install a default route
#INSTALL_DEFAULT_ROUTE="no"