* [gentoo-commits] dev/mgorny:master commit in: net-dns/resolvconf-symlink/
@ 2011-08-10 9:43 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2011-08-10 9:43 UTC (permalink / raw
To: gentoo-commits
commit: 1d24fa1c93af91294901b3e795f06a571dd0bd32
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 09:44:58 2011 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 09:44:58 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=1d24fa1c
net-dns/resolvconf-symlink: Add an ebuild creating /etc/resolv.conf symlink. For testing/reference.
(Portage version: 2.2.0_alpha50_p1/git/Linux x86_64, signed Manifest commit with key 42B9401D)
---
net-dns/resolvconf-symlink/Manifest | 14 +++++
net-dns/resolvconf-symlink/metadata.xml | 12 +++++
.../resolvconf-symlink/resolvconf-symlink-0.ebuild | 53 ++++++++++++++++++++
3 files changed, 79 insertions(+), 0 deletions(-)
diff --git a/net-dns/resolvconf-symlink/Manifest b/net-dns/resolvconf-symlink/Manifest
new file mode 100644
index 0000000..6d866c7
--- /dev/null
+++ b/net-dns/resolvconf-symlink/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD resolvconf-symlink-0.ebuild 1515 RMD160 64266461db1efc6120a405168c738309bbd78822 SHA1 0d44fef30b2815a45f9112cd8647ccb7a2d75551 SHA256 5f05453ea27a9cc27ba2472ba6993d4b7b83851d74c53c9f5110a4103e23d806
+MISC metadata.xml 341 RMD160 fd0c072cc39a02d3966832e98f933ced70623716 SHA1 37334a1d093ba4343b02c61a48917a38e02888af SHA256 e963d43ebe02b71c47fa94c9eb398a0d69203929af6407b23649c4bf8982ddc6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iJwEAQEIAAYFAk5CUxoACgkQfXuS5UK5QB1vvQQAqBOXJam8FLEg4JSn+r94tdTn
+Cg2KfqxwwugB6UDlXAkIMgzzYAHo/WGZY3FSr0HzTgyw9X35Gaa5noAeGr0P4VNh
+fdIrLcAQ3WSJIP+HxgCjTds+PVw5uYERO/4tguuzRh7fAWcmERcbaesxZK+CAmdX
+kVUTKfuoPGkb3uI3j3A=
+=5BdO
+-----END PGP SIGNATURE-----
diff --git a/net-dns/resolvconf-symlink/metadata.xml b/net-dns/resolvconf-symlink/metadata.xml
new file mode 100644
index 0000000..f172967
--- /dev/null
+++ b/net-dns/resolvconf-symlink/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>no-herd</herd>
+ <maintainer>
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+ <use>
+ <flag name='symlink'>Replace /etc/resolv.conf with a symlink.</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild b/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild
new file mode 100644
index 0000000..f0c1a23
--- /dev/null
+++ b/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+DESCRIPTION="Make /etc/resolv.conf a symlink to runtime-writable location"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+symlink"
+
+S=${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)" \
+ != "# Generated by resolvconf" ]]; 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, please"
+ eerror "set USE=-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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: net-dns/resolvconf-symlink/
@ 2011-08-10 9:57 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2011-08-10 9:57 UTC (permalink / raw
To: gentoo-commits
commit: 545c4f2f98fe975085d3e957dd780d11ea84c7de
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 09:58:35 2011 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 09:58:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=545c4f2f
net-dns/resolvconf-symlink: Make the wildcard match NetworkManager as well.
(Portage version: 2.2.0_alpha50_p1/git/Linux x86_64, signed Manifest commit with key 42B9401D)
---
net-dns/resolvconf-symlink/Manifest | 12 ++++++------
.../resolvconf-symlink/resolvconf-symlink-0.ebuild | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/net-dns/resolvconf-symlink/Manifest b/net-dns/resolvconf-symlink/Manifest
index 6d866c7..5383f81 100644
--- a/net-dns/resolvconf-symlink/Manifest
+++ b/net-dns/resolvconf-symlink/Manifest
@@ -1,14 +1,14 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-EBUILD resolvconf-symlink-0.ebuild 1515 RMD160 64266461db1efc6120a405168c738309bbd78822 SHA1 0d44fef30b2815a45f9112cd8647ccb7a2d75551 SHA256 5f05453ea27a9cc27ba2472ba6993d4b7b83851d74c53c9f5110a4103e23d806
+EBUILD resolvconf-symlink-0.ebuild 1506 RMD160 0ecea82863d658a261571e7cf37dd1c088a55f7c SHA1 1389ea5bd5e0433691a1bdbaca1f8b78dfa12e1f SHA256 18fdc531d33d5e1d7ed42b65c7617816b0d71edc54f26a06779232cc00be31cf
MISC metadata.xml 341 RMD160 fd0c072cc39a02d3966832e98f933ced70623716 SHA1 37334a1d093ba4343b02c61a48917a38e02888af SHA256 e963d43ebe02b71c47fa94c9eb398a0d69203929af6407b23649c4bf8982ddc6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iJwEAQEIAAYFAk5CUxoACgkQfXuS5UK5QB1vvQQAqBOXJam8FLEg4JSn+r94tdTn
-Cg2KfqxwwugB6UDlXAkIMgzzYAHo/WGZY3FSr0HzTgyw9X35Gaa5noAeGr0P4VNh
-fdIrLcAQ3WSJIP+HxgCjTds+PVw5uYERO/4tguuzRh7fAWcmERcbaesxZK+CAmdX
-kVUTKfuoPGkb3uI3j3A=
-=5BdO
+iJwEAQEIAAYFAk5CVksACgkQfXuS5UK5QB11+gQArJGDGicVN7AUkYjR0kLDkLsG
+lt7JXDjkpyt+Yuv6/6n/UOSoK7ds5fRSqXpgaUqQk4pLvCfhih/8fQnD+M3W5LsF
+wIpa+DvJTe8MQVdlniIQB6xPuZstTdTjUP+9VeznDa+dG53eUVp8mhINSe/2zV7A
+VfouMSCWDF3UV6Y3lZU=
+=Z1vO
-----END PGP SIGNATURE-----
diff --git a/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild b/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild
index f0c1a23..bed0009 100644
--- a/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild
+++ b/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild
@@ -20,7 +20,7 @@ pkg_preinst() {
if [[ -f "${ROOT}"etc/resolv.conf && ! -L "${ROOT}"etc/resolv.conf ]]
then # migrate existing resolv.conf
if [[ "$(head -n 1 "${ROOT}"etc/resolv.conf)" \
- != "# Generated by resolvconf" ]]; then
+ != "# 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"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: net-dns/resolvconf-symlink/
@ 2011-10-16 21:17 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2011-10-16 21:17 UTC (permalink / raw
To: gentoo-commits
commit: 1575cd325630210f06f7ac5a923fec68f6b9ec2e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 16 21:17:01 2011 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 21:17:01 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=1575cd32
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>mgorny@gentoo.org</email>
- <name>Michał Górny</name>
- </maintainer>
- <use>
- <flag name='symlink'>Replace /etc/resolv.conf with a symlink.</flag>
- </use>
-</pkgmetadata>
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=4
-
-DESCRIPTION="Make /etc/resolv.conf a symlink to runtime-writable location"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+symlink"
-
-S=${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)" \
- != "# 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, please"
- eerror "set USE=-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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-10-16 21:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-10 9:43 [gentoo-commits] dev/mgorny:master commit in: net-dns/resolvconf-symlink/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2011-08-10 9:57 Michał Górny
2011-10-16 21:17 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox