resolvconf -s now does service commands so subscribers don't need to know about how...

[openresolv] / libc

diff --git a/libc b/libc
index d008781ace797ae477ecce24c5b29526ee865a6b..ba0cbdd46c6e77d22e53b7b8b63157e9df9e8494 100755 (executable)
--- a/libc
+++ b/libc
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 

-PREFIX=/
+PREFIX=

 RESOLVCONF="${PREFIX}"/etc/resolvconf
 RESOLVCONFS="$(resolvconf -l)"
 BASE="${RESOLVCONF}/resolv.conf.d/base"
 RESOLVCONF="${PREFIX}"/etc/resolvconf
 RESOLVCONFS="$(resolvconf -l)"
 BASE="${RESOLVCONF}/resolv.conf.d/base"


@@ -141,13 +141,7 @@ fi
 # Create our resolv.conf now
 printf "${NEWCONF}" > "${RESOLVCONF}"/run/resolv.conf
 
 # Create our resolv.conf now
 printf "${NEWCONF}" > "${RESOLVCONF}"/run/resolv.conf
 

-# Restart nscd if it's running
-if [ -x /etc/init.d/nscd ]; then
-       /etc/init.d/nscd --nodeps --quiet conditionalrestart
-fi
-if [ -x /etc/rc.d/nscd ]; then
-       /etc/rc.d/nscd restart
-fi
+resolvconf -s nscd restart

 
 # Notify users of the resolver
 for x in "${REVOLVCONF}"/update-libc.d/*; do
 
 # Notify users of the resolver
 for x in "${REVOLVCONF}"/update-libc.d/*; do