diff options
| author |   William Hubbs <williamh@gentoo.org> | 2013-08-16 18:12:50 +0000 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2013-08-16 18:12:50 +0000 |
| commit | 8396699c6e6db6f9d57f5298ed8666b4d35cff31 (patch) | |
| tree | b41ada41767fc22720b65ac73df9345737c4a853 /sys-apps/openrc | |
| parent | Version bump (diff) | |
| download | gentoo-2-8396699c6e6db6f9d57f5298ed8666b4d35cff31.tar.gz gentoo-2-8396699c6e6db6f9d57f5298ed8666b4d35cff31.tar.bz2 gentoo-2-8396699c6e6db6f9d57f5298ed8666b4d35cff31.zip | |
move the net comment into a here document.
(Portage version: 2.2.0/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
Diffstat (limited to 'sys-apps/openrc')
| -rw-r--r-- | sys-apps/openrc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/openrc/files/net.confd.comment | 5 | ||||
| -rw-r--r-- | sys-apps/openrc/openrc-0.12.ebuild | 11 |
3 files changed, 14 insertions, 8 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog index af42f990a928..e86a206bc292 100644 --- a/sys-apps/openrc/ChangeLog +++ b/sys-apps/openrc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/openrc # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.276 2013/08/16 17:39:21 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.277 2013/08/16 18:12:50 williamh Exp $ + + 16 Aug 2013; William Hubbs <williamh@gentoo.org> -files/net.confd.comment, + openrc-0.12.ebuild: + move the net comment into a here document. 16 Aug 2013; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild: partially sync live ebuild diff --git a/sys-apps/openrc/files/net.confd.comment b/sys-apps/openrc/files/net.confd.comment deleted file mode 100644 index 250ce67f9250..000000000000 --- a/sys-apps/openrc/files/net.confd.comment +++ /dev/null @@ -1,5 +0,0 @@ - -# The network scripts are now part of net-misc/netifrc -# In order to avoid sys-apps/${P} from removing this file, this comment was -# added; you can safely remove this comment. Please see -# /usr/share/doc/netifrc*/README* for more information. diff --git a/sys-apps/openrc/openrc-0.12.ebuild b/sys-apps/openrc/openrc-0.12.ebuild index b83497490110..0445dfe42a32 100644 --- a/sys-apps/openrc/openrc-0.12.ebuild +++ b/sys-apps/openrc/openrc-0.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.12.ebuild,v 1.3 2013/08/16 16:13:14 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.12.ebuild,v 1.4 2013/08/16 18:12:50 williamh Exp $ EAPI=5 @@ -212,9 +212,16 @@ pkg_preinst() { # ensure existing /etc/conf.d/net is not removed # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier # this needs to stay in openrc ebuilds for a long time. :( + # Added in 0.12. if [[ -f "${EROOT}"etc/conf.d/net ]]; then einfo "Modifying conf.d/net to keep it from being removed" - cat "${FILESDIR}"/net.confd.comment >>"${EROOT}"etc/conf.d/net + cat <<-EOF >>"${EROOT}"etc/conf.d/net + +# The network scripts are now part of net-misc/netifrc +# In order to avoid sys-apps/${P} from removing this file, this comment was +# added; you can safely remove this comment. Please see +# /usr/share/doc/netifrc*/README* for more information. +EOF fi fi } |