Always add the generated by comment to resolv.conf and remove the default head file.
authorRoy Marples <roy@marples.name>
Sun, 15 Mar 2009 08:32:27 +0000 (08:32 +0000)
committerRoy Marples <roy@marples.name>
Sun, 15 Mar 2009 08:32:27 +0000 (08:32 +0000)
Makefile
libc.in
resolv.conf.head [deleted file]

index a4d1fe27cfce2602eb60c811b5db38a244e3f72c..eff9d56548286447b2ebf15c8cf4f0f118362d40 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NAME=          openresolv
-VERSION=       2.1
+VERSION=       2.1.1
 PKG=           ${NAME}-${VERSION}
 
 INSTALL?=      install
@@ -41,8 +41,6 @@ install: ${TARGET}
        ${INSTALL} -m ${BINMODE} resolvconf ${DESTDIR}${BINDIR}
        ${INSTALL} -d ${DESTDIR}${LIBEXECDIR}
        ${INSTALL} -m ${BINMODE} ${SUBSCRIBERS} ${DESTDIR}${LIBEXECDIR}
-       ${INSTALL} -d ${DESTDIR}${SYSCONFDIR}
-       ${INSTALL} -m ${DOCMODE} resolv.conf.head ${DESTDIR}${SYSCONFDIR}
        ${INSTALL} -d ${DESTDIR}${MANDIR}/man8
        ${INSTALL} -m ${MANMODE} resolvconf.8 ${DESTDIR}${MANDIR}/man8
 
@@ -53,4 +51,4 @@ dist:
        rm -rf /tmp/${PKG}/*.bz2 /tmp/${PKG}/.svn
        tar cvjpf ${PKG}.tar.bz2 -C /tmp ${PKG} 
        rm -rf /tmp/${PKG} 
-       ls -l ${PKG}.tar.bz2
\ No newline at end of file
+       ls -l ${PKG}.tar.bz2
diff --git a/libc.in b/libc.in
index 6adbebdc0d913a7a32f5a558c084b5d7e68cab09..a67dc82079bc3821506a536351619d4d4d32f5dd 100644 (file)
--- a/libc.in
+++ b/libc.in
@@ -86,7 +86,7 @@ NEWSEARCH="$(uniqify ${NEWSEARCH} ${SEARCH})"
 NEWNS="$(uniqify ${NEWNS} ${NAMESERVERS})"
 
 # Hold our new resolv.conf in a variable to save on temporary files
-NEWCONF=""
+NEWCONF="# Generated by resolvconf\n"
 [ -e "${SYSCONFDIR}"/resolv.conf.head ] \
        && NEWCONF="${NEWCONF}$(cat "${SYSCONFDIR}"/resolv.conf.head)\n"
 [ -n "${NEWSEARCH}" ] && NEWCONF="${NEWCONF}search ${NEWSEARCH}\n"
@@ -129,4 +129,4 @@ for x in "${LIBEXECDIR}"/libc.d/*; do
                retval=$((${retval} + $?))
        fi
 done
-exit ${retval}
\ No newline at end of file
+exit ${retval}
diff --git a/resolv.conf.head b/resolv.conf.head
deleted file mode 100644 (file)
index fcf8ab4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Generated by resolvconf