| 1 |
diff -p -up resolvconf-1.41/etc/resolvconf/update.d/libc.symlink resolvconf-1.41/etc/resolvconf/update.d/libc |
| 2 |
--- resolvconf-1.41/etc/resolvconf/update.d/libc.symlink 2008-08-05 15:13:34.000000000 +0200 |
| 3 |
+++ resolvconf-1.41/etc/resolvconf/update.d/libc 2008-08-05 15:21:17.000000000 +0200 |
| 4 |
@@ -20,7 +20,7 @@ PATH=/sbin:/bin:/usr/bin |
| 5 |
# /etc/resolv.conf is not a symbolic link |
| 6 |
|
| 7 |
# Default value |
| 8 |
-REPORT_ABSENT_SYMLINK=y |
| 9 |
+REPORT_ABSENT_SYMLINK=no |
| 10 |
TRUNCATE_NAMESERVER_LIST_AFTER_127=y |
| 11 |
|
| 12 |
# Default override |
| 13 |
@@ -118,9 +118,15 @@ for N in $NMSRVRS ; do echo "nameserver |
| 14 |
|
| 15 |
### Put the file in place ### |
| 16 |
|
| 17 |
+move_rslvcnf() { |
| 18 |
+ cat "$TMPFILE" > "$DYNAMICRSLVCNFFILE" |
| 19 |
+ rm -f "$TMPFILE" |
| 20 |
+} |
| 21 |
+ |
| 22 |
# On init, just put it in place |
| 23 |
if [ "$1" = "-i" ] ; then |
| 24 |
- mv -f "$TMPFILE" "$DYNAMICRSLVCNFFILE" |
| 25 |
+ ln -sf "${ETC}/resolv.conf" "$DYNAMICRSLVCNFFILE" |
| 26 |
+ move_rslvcnf |
| 27 |
exit 0 |
| 28 |
fi |
| 29 |
|
| 30 |
@@ -131,7 +137,7 @@ if [ -f "$DYNAMICRSLVCNFFILE" ] && [ "$( |
| 31 |
fi |
| 32 |
|
| 33 |
# The file has changed |
| 34 |
-mv -f "$TMPFILE" "$DYNAMICRSLVCNFFILE" |
| 35 |
+move_rslvcnf |
| 36 |
|
| 37 |
# Restart nscd |
| 38 |
NSCD_RESTARTED="" |
| 39 |
diff -p -up resolvconf-1.41/man/resolvconf.8.symlink resolvconf-1.41/man/resolvconf.8 |
| 40 |
--- resolvconf-1.41/man/resolvconf.8.symlink 2008-03-24 19:55:26.000000000 +0100 |
| 41 |
+++ resolvconf-1.41/man/resolvconf.8 2008-08-05 15:13:34.000000000 +0200 |
| 42 |
@@ -120,12 +120,6 @@ When nameserver information is updated t |
| 43 |
/etc/resolvconf/update.d/libc writes a new resolver configuration |
| 44 |
file to /etc/resolvconf/run/resolv.conf and then runs the scripts in |
| 45 |
/etc/resolvconf/update-libc.d/. |
| 46 |
-To make the resolver use the dynamically generated resolver configuration |
| 47 |
-file the administrator should ensure that /etc/resolv.conf is a symbolic |
| 48 |
-link to /etc/resolvconf/run/resolv.conf. |
| 49 |
-This link is never modified by \fB/sbin/resolvconf\fR. |
| 50 |
-If you find that \fI/etc/resolv.conf\fR is not being updated, |
| 51 |
-check to see that the link is intact. |
| 52 |
.PP |
| 53 |
The GNU C Library resolver library isn't the only resolver library available. |
| 54 |
However, any resolver library that reads /etc/resolv.conf |
Parent Directory
| 
Revision Log