summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-13 00:40:07 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-13 00:40:07 +0000
commit64f9c0990a8c293729da9fe2b298cf6a5cca0680 (patch)
treef5ac0d1104c532dc01ec04853cfdd9748ae3b85b
parent9ecebf87927ac860a3f2c59467796e5ae85803cb (diff)
various cosmetic fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@864 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xopenwrt/target/default/target_skeleton/bin/firstboot6
-rw-r--r--openwrt/target/default/target_skeleton/etc/dnsmasq.conf2
-rwxr-xr-xopenwrt/target/default/target_skeleton/etc/functions.sh2
-rwxr-xr-xopenwrt/target/default/target_skeleton/sbin/ifup8
4 files changed, 5 insertions, 13 deletions
diff --git a/openwrt/target/default/target_skeleton/bin/firstboot b/openwrt/target/default/target_skeleton/bin/firstboot
index 8bb0b3efa4..2e7481db81 100755
--- a/openwrt/target/default/target_skeleton/bin/firstboot
+++ b/openwrt/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/openwrt/target/default/target_skeleton/etc/dnsmasq.conf b/openwrt/target/default/target_skeleton/etc/dnsmasq.conf
index 61550717f0..293edc600a 100644
--- a/openwrt/target/default/target_skeleton/etc/dnsmasq.conf
+++ b/openwrt/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/openwrt/target/default/target_skeleton/etc/functions.sh b/openwrt/target/default/target_skeleton/etc/functions.sh
index 75500a2aab..48f1191cc4 100755
--- a/openwrt/target/default/target_skeleton/etc/functions.sh
+++ b/openwrt/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/openwrt/target/default/target_skeleton/sbin/ifup b/openwrt/target/default/target_skeleton/sbin/ifup
index 4236de06b6..f3230ba410 100755
--- a/openwrt/target/default/target_skeleton/sbin/ifup
+++ b/openwrt/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