summaryrefslogtreecommitdiff
path: root/package/base-files/src
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-23 20:52:34 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-23 20:52:34 +0100
commit9e2fdf23756dc13ce89f0ca185a6223c02d3f14a (patch)
tree5d80a8872e75a637872b8987f0db21041e27263c /package/base-files/src
parent15ce6d4a74407a920b82b0f7b7422a668a78f7c2 (diff)
parent52188df5ff2c0cc5a43230915d6bc09dd7c28a32 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/base-files/src')
-rw-r--r--package/base-files/src/etc/ipkg.conf2
-rwxr-xr-xpackage/base-files/src/usr/share/udhcpc/default.script4
2 files changed, 1 insertions, 5 deletions
diff --git a/package/base-files/src/etc/ipkg.conf b/package/base-files/src/etc/ipkg.conf
index cef6d2845..9c5ae17d3 100644
--- a/package/base-files/src/etc/ipkg.conf
+++ b/package/base-files/src/etc/ipkg.conf
@@ -1,3 +1,3 @@
-src @VENDOR@ http://@HOST@/@SYSTEM@_@ARCH@_@LIBC@/packages
+src @VENDOR@ http://@HOST@/pkg/@SYSTEM@_@ARCH@_@LIBC@@ABI@/packages
dest root /
dest ram /tmp
diff --git a/package/base-files/src/usr/share/udhcpc/default.script b/package/base-files/src/usr/share/udhcpc/default.script
index 3744dfb09..55a6655ab 100755
--- a/package/base-files/src/usr/share/udhcpc/default.script
+++ b/package/base-files/src/usr/share/udhcpc/default.script
@@ -23,16 +23,12 @@ case $1 in
ip route add to default via $i
done
fi
-
- touch /tmp/resolv.conf
- ln -sf /tmp/resolv.conf $RESOLV_CONF
echo -n >$RESOLV_CONF
${domain:+echo search $domain} >>$RESOLV_CONF
for i in $dns; do
echo "adding dns $i"
echo "nameserver $i" >>$RESOLV_CONF
done
-
# user rules
[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
;;