diff options
| -rwxr-xr-x | target/default/target_skeleton/bin/firstboot | 6 | ||||
| -rw-r--r-- | target/default/target_skeleton/etc/dnsmasq.conf | 2 | ||||
| -rwxr-xr-x | target/default/target_skeleton/etc/functions.sh | 2 | ||||
| -rwxr-xr-x | target/default/target_skeleton/sbin/ifup | 8 |
4 files changed, 5 insertions, 13 deletions
diff --git a/target/default/target_skeleton/bin/firstboot b/target/default/target_skeleton/bin/firstboot index 8bb0b3efa..2e7481db8 100755 --- a/target/default/target_skeleton/bin/firstboot +++ b/target/default/target_skeleton/bin/firstboot @@ -45,12 +45,6 @@ do { } done echo "done" -echo -n "fixing ipkg symlinks... " -for file in $( find /usr/lib/ipkg/info/*list -type l;) -do { - rm $file; cp -f /rom/$file $file -} done - touch /tmp/resolv.conf ln -s /tmp/resolv.conf /etc/resolv.conf diff --git a/target/default/target_skeleton/etc/dnsmasq.conf b/target/default/target_skeleton/etc/dnsmasq.conf index 61550717f..293edc600 100644 --- a/target/default/target_skeleton/etc/dnsmasq.conf +++ b/target/default/target_skeleton/etc/dnsmasq.conf @@ -11,7 +11,7 @@ domain=lan except-interface=vlan1 # enable dhcp (start,end,netmask,leasetime) -#dhcp-authoritative +dhcp-authoritative dhcp-range=192.168.1.100,192.168.1.250,255.255.255.0,12h dhcp-leasefile=/tmp/dhcp.leases diff --git a/target/default/target_skeleton/etc/functions.sh b/target/default/target_skeleton/etc/functions.sh index 75500a2aa..48f1191cc 100755 --- a/target/default/target_skeleton/etc/functions.sh +++ b/target/default/target_skeleton/etc/functions.sh @@ -29,5 +29,5 @@ if_valid () { $DEBUG vconfig add $vif $i 2>&- ) } || - { echo -e "# $1 ignored: can't find/create"; false; } + { debug "# missing interface '$if' ignored"; false; } } diff --git a/target/default/target_skeleton/sbin/ifup b/target/default/target_skeleton/sbin/ifup index 4236de06b..f3230ba41 100755 --- a/target/default/target_skeleton/sbin/ifup +++ b/target/default/target_skeleton/sbin/ifup @@ -52,12 +52,10 @@ fi ${DEBUG:-eval} "udhcpc -i $if ${ip:+-r $ip} -b -p $pidfile &" ;; - pppoe) - # handled by /etc/init.d/S50pppoe - ;; - none) + none|"") + # pppoe is handled by /etc/init.d/S50pppoe ;; *) - echo "### WARNING $if: $if_proto is not supported" + echo "### ifup $type: ignored ${type}_proto=\"$if_proto\" (not supported)" ;; esac |