summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2012-10-18 15:03:19 +0000
committerWilliam Hubbs <williamh@gentoo.org>2012-10-18 15:03:19 +0000
commit2e5d48a1ac8a4ca3b2e8787b96d25e0675b376f7 (patch)
treed00052f716c6f75d154c198aa8341e08e3d6b91b /sys-apps/openrc
parentclarify dependencies (diff)
downloadgentoo-2-2e5d48a1ac8a4ca3b2e8787b96d25e0675b376f7.tar.gz
gentoo-2-2e5d48a1ac8a4ca3b2e8787b96d25e0675b376f7.tar.bz2
gentoo-2-2e5d48a1ac8a4ca3b2e8787b96d25e0675b376f7.zip
Only show warning about adding the net script to the boot runlevel if necessary.
(Portage version: 2.2.0_alpha140/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
Diffstat (limited to 'sys-apps/openrc')
-rw-r--r--sys-apps/openrc/ChangeLog6
-rw-r--r--sys-apps/openrc/openrc-9999.ebuild10
2 files changed, 11 insertions, 5 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 1f6fef5832a7..b2e211d81ed7 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.232 2012/10/17 16:57:56 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.233 2012/10/18 15:03:19 williamh Exp $
+
+ 18 Oct 2012; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ Only show warning about adding the net script to the boot runlevel if
+ necessary.
17 Oct 2012; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
Add a warning about adding the appropriate network script to the boot
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index eb5ab3d0a5e2..263dd20a9709 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.110 2012/10/17 16:57:56 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.111 2012/10/18 15:03:19 williamh Exp $
EAPI=4
@@ -439,9 +439,11 @@ pkg_postinst() {
local netscript=net.lo
fi
- ewarn "Please add the $netscript script to your boot runlevel"
- ewarn "as soon as possible. Not doing so could leave you with a system"
- ewarn "without networking."
+ if [ ! -e "${EROOT}"/etc/runlevels/boot/${netscript} ]; then
+ ewarn "Please add the $netscript script to your boot runlevel"
+ ewarn "as soon as possible. Not doing so could leave you with a system"
+ ewarn "without networking."
+ fi
elog "You should now update all files in /etc, using etc-update"
elog "or equivalent before restarting any services or this host."