diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-24 13:43:37 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-24 13:43:37 +0100 |
| commit | f71d123ae12dad7f1b3df2be6e8a9353f12901da (patch) | |
| tree | 9465ea8919853fd47658e4f45749ce6caf327121 /package/base-files/src | |
| parent | 76ffcba54b786e9c9e17c10998e3ca14b800326e (diff) | |
| parent | 8c2b233efc34f05295367069d2b134560a4f1add (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.conf | 2 | ||||
| -rwxr-xr-x | package/base-files/src/usr/share/udhcpc/default.script | 4 |
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 ;; |