From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RFY5A-0007qd-JR for garchives@archives.gentoo.org; Sun, 16 Oct 2011 21:17:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3832F21C036; Sun, 16 Oct 2011 21:17:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EFBC521C036 for ; Sun, 16 Oct 2011 21:17:12 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 748F61B402A for ; Sun, 16 Oct 2011 21:17:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D76A58004C for ; Sun, 16 Oct 2011 21:17:11 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1575cd325630210f06f7ac5a923fec68f6b9ec2e.mgorny@gentoo> Subject: [gentoo-commits] dev/mgorny:master commit in: net-dns/resolvconf-symlink/ X-VCS-Repository: dev/mgorny X-VCS-Files: net-dns/resolvconf-symlink/metadata.xml net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild X-VCS-Directories: net-dns/resolvconf-symlink/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1575cd325630210f06f7ac5a923fec68f6b9ec2e Date: Sun, 16 Oct 2011 21:17:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 04e94eec3caae05d1a5192fcf704890c commit: 1575cd325630210f06f7ac5a923fec68f6b9ec2e Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Sun Oct 16 21:17:01 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Sun Oct 16 21:17:01 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/mgorny.git;a=3D= commit;h=3D1575cd32 net-dns/resolvconf-symlink: Moved to gx86. --- net-dns/resolvconf-symlink/metadata.xml | 11 ---- .../resolvconf-symlink/resolvconf-symlink-0.ebuild | 53 --------------= ------ 2 files changed, 0 insertions(+), 64 deletions(-) diff --git a/net-dns/resolvconf-symlink/metadata.xml b/net-dns/resolvconf= -symlink/metadata.xml deleted file mode 100644 index 26f81d4..0000000 --- a/net-dns/resolvconf-symlink/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - mgorny@gentoo.org - Micha=C5=82 G=C3=B3rny - - - Replace /etc/resolv.conf with a symlink. - - diff --git a/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild b/net= -dns/resolvconf-symlink/resolvconf-symlink-0.ebuild deleted file mode 100644 index bed0009..0000000 --- a/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D4 - -DESCRIPTION=3D"Make /etc/resolv.conf a symlink to runtime-writable locat= ion" -HOMEPAGE=3D"http://www.gentoo.org" -SRC_URI=3D"" - -LICENSE=3D"public-domain" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"+symlink" - -S=3D${WORKDIR} - -pkg_preinst() { - if use symlink; then - if [[ -f "${ROOT}"etc/resolv.conf && ! -L "${ROOT}"etc/resolv.conf ]] - then # migrate existing resolv.conf - if [[ "$(head -n 1 "${ROOT}"etc/resolv.conf)" \ - !=3D "# Generated by "* ]]; then - - eerror "${ROOT}etc/resolv.conf seems not to be autogenerated." - eerror "Aborting build to avoid removing user data. If that file is = supposed" - eerror "to be autogenerated, please remove it manually. Otherwise, p= lease" - eerror "set USE=3D-symlink to avoid installing resolv.conf symlink." - - die "${ROOT}etc/resolv.conf not autogenerated" - else - ebegin "Moving ${ROOT}etc/resolv.conf to ${ROOT}var/run/" - mv "${ROOT}"etc/resolv.conf "${ROOT}"var/run/ - eend ${?} || die - fi - fi - fi -} - -src_install() { - # XXX: /run should be more correct, when it's supported by baselayout - - use symlink && dosym /var/run/resolv.conf /etc/resolv.conf -} - -pkg_postrm() { - # Don't leave the user with no resolv.conf - if [[ ! -e "${ROOT}"etc/resolv.conf && -f "${ROOT}"var/run/resolv.conf = ]]; then - ebegin "Moving ${ROOT}var/run/resolv.conf to ${ROOT}etc/" - mv "${ROOT}"var/run/resolv.conf "${ROOT}"etc/ - eend ${?} || die - fi -}