diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:52:51 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:52:51 +0100 |
| commit | 58d31896056e604185acf3606b99257cea519dd1 (patch) | |
| tree | 3a0fb34da5dbe8dc12326fcd7fbf0c3916028f41 /package/base-files/src/usr/share/udhcpc/default.script | |
| parent | 220a96f9926788ed531717f78e44fdf1e7ab3b34 (diff) | |
| parent | 845317b460ee99ad633534cad4de72404af7e30b (diff) | |
resolve merge conflicts
Diffstat (limited to 'package/base-files/src/usr/share/udhcpc/default.script')
| -rwxr-xr-x | package/base-files/src/usr/share/udhcpc/default.script | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/package/base-files/src/usr/share/udhcpc/default.script b/package/base-files/src/usr/share/udhcpc/default.script index 68c603496..415bf92a4 100755 --- a/package/base-files/src/usr/share/udhcpc/default.script +++ b/package/base-files/src/usr/share/udhcpc/default.script @@ -23,6 +23,8 @@ case $1 in 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 |