X-Git-Url: https://roy.marples.name/git diff --git a/libc b/libc index 47e25cc..ba0cbdd 100755 --- a/libc +++ b/libc @@ -1,12 +1,31 @@ #!/bin/sh # Copyright 2006 Gentoo Foundation # Copyright 2007 Roy Marples -# Distributed under the terms of the GNU General Public License v2 - -# libc resolv.conf updater - -# Written by Roy Marples (uberlord@gentoo.org) -# Heavily based on Debian resolvconf by Thomas Hood +# All rights reserved + +# libc subscriber for resolvconf + +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided +# with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (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= RESOLVCONF="${PREFIX}"/etc/resolvconf @@ -122,13 +141,7 @@ fi # 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