diff options
-rw-r--r-- | net-dns/openresolv/ChangeLog | 5 | ||||
-rw-r--r-- | net-dns/openresolv/openresolv-1.3.ebuild | 54 |
2 files changed, 15 insertions, 44 deletions
diff --git a/net-dns/openresolv/ChangeLog b/net-dns/openresolv/ChangeLog index 25a7dce970bb..0cb6502cfa68 100644 --- a/net-dns/openresolv/ChangeLog +++ b/net-dns/openresolv/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-dns/openresolv # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.2 2008/02/18 19:54:54 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.3 2008/02/20 21:01:08 welp Exp $ + + 20 Feb 2008; <welp@gentoo.org> openresolv-1.3.ebuild: + Patch it properly this time... Bug 209423 *openresolv-1.3 (18 Feb 2008) diff --git a/net-dns/openresolv/openresolv-1.3.ebuild b/net-dns/openresolv/openresolv-1.3.ebuild index 953fbd5f8b04..4a4cbd42702f 100644 --- a/net-dns/openresolv/openresolv-1.3.ebuild +++ b/net-dns/openresolv/openresolv-1.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/openresolv-1.3.ebuild,v 1.1 2008/02/18 19:54:54 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/openresolv-1.3.ebuild,v 1.2 2008/02/20 21:01:08 welp Exp $ inherit eutils @@ -21,50 +21,18 @@ src_install() { make DESTDIR="${D}" install || die "Failed to install" } -pkg_postinst() { - if [ ! -"L ${ROOT}/etc/resolv.conf" ] \ - || [ "$(readlink "${ROOT}/etc/resolv.conf")" != \ - "resolvconf/run/resolv.conf" ] ; then - ewarn "resolvconf requires ${ROOT}etc/resolv.conf to be a symbolic" - ewarn "to resolvconf/run/resolv.conf" - ewarn "To set this up automatically type" - ewarn " emerge --config =${PF}" - fi -} - pkg_config() { - cd "${ROOT}/etc" - if [ -L resolv.conf -a "$(readlink resolv.conf)" = \ - "resolvconf/run/resolv.conf" ] ; then - einfo "${ROOT}etc/resolv.conf is already configured for ${PN}" - else - if [ -e resolv.conf ] ; then - einfo "Your existing resolv.conf is will be mapped to an" - einfo "interface called \"dummy\" in resolvconf. This will" - einfo "disappear when you reboot." - cp resolv.conf resolvconf/run/resolv.conf - [ ! -d resolvconf/run/interfaces ] \ - && mkdir resolvconf/run/interfaces - cp resolv.conf resolvconf/run/interfaces/dummy - echo "dummy" > resolvconf/run/add_order - fi - rm -f resolv.conf - ln -snf resolvconf/run/resolv.conf . - einfo "${ROOT}etc/resolv.conf is now correctly configured for ${PN}" + if [ "${ROOT}" != "/" ]; then + eerror "We cannot configure unless \$ROOT=/" + return 1 fi -} -pkg_postrm() { - # If we are totally removed but still configured, then replace - # /etc/resolv.conf with a real file - cd "${ROOT}"/etc - [ -L resolv.conf ] || return 0 - if [ -e resolv.conf ]; then - [ "$(readlink resolv.conf)" = "resolvconf/run/resolv.conf" ] || return 0 - rm resolv.conf - cp resolvconf/run/resolv.conf . - elif [ -e /var/run/resolvconf/resolv.conf ]; then - rm resolv.conf - cp /var/run/resolvconf/resolv.conf . + if [ -n "$(resolvconf -l)" ]; then + einfo "${PN} already has DNS information" + else + ebegin "Copying /etc/resolv.conf to resolvconf -a dummy" + resolvconf -a dummy </etc/resolv.conf + eend $? || return $? + einfo "The dummy interface will disappear when you next reboot" fi } |