Rewrite the oldnet handling and make it the default for everyone.

(Portage version: 2.2_rc42/cvs/Linux x86_64)

3 files changed, 400 insertions, 59 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 91bfec8fbcb7..81f55eb234f7 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.80 2009/10/14 11:04:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.81 2009/10/15 08:26:52 vapier Exp $
+
+*openrc-0.5.1-r1 (15 Oct 2009)
+
+  15 Oct 2009; Mike Frysinger <vapier@gentoo.org> +openrc-0.5.1-r1.ebuild,
+  openrc-9999.ebuild:
+  Rewrite the oldnet handling and make it the default for everyone.
 
   10 Oct 2009; Matthias Schwarzott <zzam@gentoo.org> openrc-0.5.1.ebuild,
   openrc-9999.ebuild:
diff --git a/sys-apps/openrc/openrc-0.5.1-r1.ebuild b/sys-apps/openrc/openrc-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..ef0d3369a28c
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.5.1-r1.ebuild
@@ -0,0 +1,356 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.5.1-r1.ebuild,v 1.1 2009/10/15 08:26:52 vapier Exp $
+
+EAPI="1"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://roy.marples.name/openrc.git"
+	inherit git
+	KEYWORDS=""
+else
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2
+		mirror://gentoo/${P}.tar.bz2
+		http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2
+		http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="http://roy.marples.name/openrc"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="debug elibc_glibc ncurses pam unicode kernel_linux kernel_FreeBSD"
+
+RDEPEND="virtual/init
+	kernel_FreeBSD? ( sys-process/fuser-bsd )
+	elibc_glibc? ( >=sys-libs/glibc-2.5 )
+	ncurses? ( sys-libs/ncurses )
+	pam? ( virtual/pam )
+	>=sys-apps/baselayout-2.0.0
+	kernel_linux? ( !<sys-apps/module-init-tools-3.2.2-r2 )
+	!<sys-fs/udev-133
+	!<sys-apps/sysvinit-2.86-r11"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+pkg_setup() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc"
+	MAKE_ARGS="${MAKE_ARGS} MKOLDNET=yes"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+
+	export DEBUG=$(usev debug)
+	export MKPAM=$(usev pam)
+	export MKTERMCAP=$(usev ncurses)
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack ${A}
+	fi
+	cd "${S}"
+	sed -i 's:0444:0644:' mk/sys.mk
+	[[ -d ${FILESDIR}/${PV} ]] \
+		&& epatch "${FILESDIR}"/${PV}/*.patch \
+		|| epatch "${FILESDIR}"/9999/*.patch
+}
+
+src_compile() {
+	# catch people running `ebuild` w/out setup
+	if [[ -z ${MAKE_ARGS} ]] ; then
+		die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?"
+	fi
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-$(echo ${EGIT_VERSION} | cut -c1-8)"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk
+	fi
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed"
+}
+
+set_conf() {
+	local file="${D}/$1" var=$2 val=NO u
+	shift 2
+	for u ; do use $u && val=YES ; done
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?[^ ]*\1:=\1${val}\1:;s:^#::}" "${file}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install || die
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${D}"/$(get_libdir)/lib{einfo,rc}* "${D}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	keepdir /$(get_libdir)/rc/{init.d,tmp}
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	mv "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die
+
+	# Stick with "old" net as the default for now
+	doconfd conf.d/net || die
+	rm -f "${D}"/usr/share/${PN}/network
+	ln -s /etc/init.d/net.lo "${D}"/usr/share/${PN}/net.lo
+
+	# Setup unicode defaults for silly unicode users
+	set_conf /etc/rc.conf unicode unicode
+
+	# Cater to the norm
+	set_conf /etc/conf.d/keymaps windowkeys x86 amd64
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+}
+
+add_boot_init() {
+	local initd=$1
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \
+		|| return
+	[[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d ${ROOT}/etc/runlevels/boot ]] ; then
+		mkdir -p "${ROOT}"/etc/runlevels/boot
+		touch "${ROOT}"/etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your boot runlevel"
+	ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${ROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# default net script is just comments, so no point in biting people
+	# in the ass by accident.  we save in preinst so that the package
+	# manager doesnt go throwing etc-update crap at us -- postinst is
+	# too late to prevent that.  this behavior also lets us keep the
+	# file in the CONTENTS for binary packages.
+	[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${D}"/etc/conf.d/
+
+	# upgrade timezone file ... do it before moving clock
+	if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then
+		(
+		source "${ROOT}"/etc/conf.d/clock
+		[[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone
+		)
+	fi
+
+	# /etc/conf.d/clock moved to /etc/conf.d/hwclock
+	local clock
+	use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock"
+	if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then
+		mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock}
+	fi
+	if [[ -e ${ROOT}/etc/init.d/clock ]] ; then
+		rm -f "${ROOT}"/etc/init.d/clock
+	fi
+	if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then
+		rm -f "${ROOT}"/etc/runlevels/boot/clock
+		ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock}
+	fi
+	if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then
+		rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock
+		ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock}
+	fi
+
+	# /etc/conf.d/rc is no longer used for configuration
+	if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then
+		elog "/etc/conf.d/rc is no longer used for configuration."
+		elog "Please migrate your settings to /etc/rc.conf as applicable"
+		elog "and delete /etc/conf.d/rc"
+	fi
+
+	# force net init.d scripts into symlinks
+	for f in "${ROOT}"/etc/init.d/net.* ; do
+		[[ -e ${f} ]] || continue # catch net.* not matching anything
+		[[ ${f} == */net.lo ]] && continue # real file now
+		[[ ${f} == *.openrc.bak ]] && continue
+		if [[ ! -L ${f} ]] ; then
+			elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink."
+			elog "You should delete '${f##*/}.openrc.bak' if you don't need it."
+			mv "${f}" "${f}.openrc.bak"
+			ln -snf net.lo "${f}"
+		fi
+	done
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# openrc-0.4.0 no longer loads the udev addon
+	enable_udev=0
+	if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && \
+		[[ -e "${ROOT}"/etc/init.d/udev ]] && \
+		! has_version ">=sys-apps/openrc-0.4.0"
+	then
+		# make sure udev is in sysinit if it was enabled before
+		local rc_devices=$(
+			[[ -f /etc/rc.conf ]] && source /etc/rc.conf
+			[[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc
+			echo "${rc_devices:-${RC_DEVICES:-auto}}"
+		)
+		case ${rc_devices} in
+			udev|auto)
+				enable_udev=1
+				;;
+		esac
+	fi
+
+	# skip remaining migration if we already have openrc installed
+	has_version sys-apps/openrc || migrate_from_baselayout_1
+}
+
+migrate_from_baselayout_1() {
+	# baselayout boot init scripts have been split out
+	for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
+		# baselayout-1 is always "old" net, so ignore "new" net
+		[[ ${f} == "network" ]] && continue
+
+		add_boot_init ${f}
+	done
+
+	# Try to auto-add some addons when possible
+	add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt
+	add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt
+	add_boot_init_mit_config /etc/mdadm.conf mdraid
+	add_boot_init_mit_config /etc/evms.conf evms
+	[[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper
+	[[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm
+	elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone"
+	elog "init.d scripts.  If you use such a thing, make sure you have the"
+	elog "required init.d scripts added to your boot runlevel."
+
+	# Upgrade out state for baselayout-1 users
+	if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then
+		(
+		[[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc
+		svcdir=${svcdir:-/var/lib/init.d}
+		if [[ ! -d ${ROOT}${svcdir}/started ]] ; then
+			ewarn "No state found, and no state exists"
+			elog "You should reboot this host"
+		else
+			mkdir -p "${ROOT}${LIBDIR}/rc/init.d"
+			einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d"
+			mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d
+			rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \
+				"${ROOT}${LIBDIR}"/rc/init.d/console
+			umount "${ROOT}${svcdir}" 2>/dev/null
+			rm -rf "${ROOT}${svcdir}"
+		fi
+		)
+	fi
+
+	# Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition
+	if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
+		elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules"
+		rm -f "${ROOT}"/etc/modules.autoload.d/.keep*
+		rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null
+		if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
+			local f v
+			for f in "${ROOT}"/etc/modules.autoload.d/* ; do
+				v=${f##*/}
+				v=${v#kernel-}
+				v=${v//[^[:alnum:]]/_}
+				gawk -v v="${v}" -v f="${f##*/}" '
+				BEGIN { print "\n### START: Auto-converted from " f "\n" }
+				{
+					if ($0 ~ /^[^#]/) {
+						print "modules_" v "=\"${modules_" v "} " $1 "\""
+						gsub(/[^[:alnum:]]/, "_", $1)
+						printf "module_" $1 "_args_" v "=\""
+						for (i = 2; i <= NF; ++i) {
+							if (i > 2)
+								printf " "
+							printf $i
+						}
+						print "\"\n"
+					} else
+						print
+				}
+				END { print "\n### END: Auto-converted from " f "\n" }
+				' "${f}" >> "${D}"/etc/conf.d/modules
+			done
+				rm -f "${f}"
+			rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null
+		fi
+	fi
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Remove old baselayout links
+	rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin}
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e ${ROOT}/etc/runlevels ]] || [[ -e ${ROOT}/etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc
+		rm -f "${ROOT}"/etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${ROOT}"/etc/runlevels/sysinit
+			cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* \
+				"${ROOT}"/etc/runlevels/sysinit
+		fi
+		if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${ROOT}"/etc/runlevels/shutdown
+			cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* \
+				"${ROOT}"/etc/runlevels/shutdown
+		fi
+	fi
+
+	if [[ "$enable_udev" = 1 ]]; then
+		elog "Auto adding udev init script to the sysinit runlevel"
+		ln -sf /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
+	fi
+
+	# update the dependency tree bug #224171
+	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
+	if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
+		ewarn "/etc/modules.autoload.d is no longer used.  Please convert"
+		ewarn "your files to /etc/conf.d/modules and delete the directory."
+	fi
+
+	elog "You should now update all files in /etc, using etc-update"
+	elog "or equivalent before restarting any services or this host."
+	elog
+	elog "Please read the migration guide available at:"
+	elog "http://www.gentoo.org/doc/en/openrc-migration.xml"
+}
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 1f054ecddc32..9270995594f1 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.54 2009/10/15 00:49:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.55 2009/10/15 08:26:52 vapier Exp $
 
 EAPI="1"
 
@@ -23,7 +23,7 @@ HOMEPAGE="http://roy.marples.name/openrc"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="debug elibc_glibc ncurses pam unicode kernel_linux kernel_FreeBSD +oldnet"
+IUSE="debug elibc_glibc ncurses pam unicode kernel_linux kernel_FreeBSD"
 
 RDEPEND="virtual/init
 	kernel_FreeBSD? ( sys-process/fuser-bsd )
@@ -41,6 +41,7 @@ pkg_setup() {
 	unset LIBDIR #266688
 
 	MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc"
+	MAKE_ARGS="${MAKE_ARGS} MKOLDNET=yes"
 
 	local brand="Unknown"
 	if use kernel_linux ; then
@@ -50,9 +51,6 @@ pkg_setup() {
 		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
 		brand="FreeBSD"
 	fi
-	if use oldnet; then
-		MAKE_ARGS="${MAKE_ARGS} MKOLDNET=yes"
-	fi
 	export BRANDING="Gentoo ${brand}"
 
 	export DEBUG=$(usev debug)
@@ -68,7 +66,9 @@ src_unpack() {
 	fi
 	cd "${S}"
 	sed -i 's:0444:0644:' mk/sys.mk
-	epatch "${FILESDIR}"/9999/*.patch
+	[[ -d ${FILESDIR}/${PV} ]] \
+		&& epatch "${FILESDIR}"/${PV}/*.patch \
+		|| epatch "${FILESDIR}"/9999/*.patch
 }
 
 src_compile() {
@@ -108,7 +108,12 @@ src_install() {
 
 	# Backup our default runlevels
 	dodir /usr/share/"${PN}"
-	mv "${D}/etc/runlevels" "${D}/usr/share/${PN}"
+	mv "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die
+
+	# Stick with "old" net as the default for now
+	doconfd conf.d/net || die
+	rm -f "${D}"/usr/share/${PN}/network
+	ln -s /etc/init.d/net.lo "${D}"/usr/share/${PN}/net.lo
 
 	# Setup unicode defaults for silly unicode users
 	set_conf /etc/rc.conf unicode unicode
@@ -118,14 +123,7 @@ src_install() {
 
 	# Support for logfile rotation
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/openrc.logrotate" openrc
-
-	# makefile does no longer install conf.d/net in use oldnet case, so store it
-	# where we can find it at merge time
-	if use oldnet; then
-		insinto /usr/share/doc/${PN}
-		newins conf.d/net net.default
-	fi
+	newins "${FILESDIR}"/openrc.logrotate openrc
 }
 
 add_boot_init() {
@@ -158,15 +156,12 @@ add_boot_init_mit_config() {
 pkg_preinst() {
 	local f LIBDIR=$(get_libdir)
 
-	if use oldnet; then
-		# default net script is just comments, so no point in biting people
-		# in the ass by accident
-		# Can this code be moved to pkg_postinst
-		# or does it have side effects like protecting conf.d/net if old version
-		# had it in CONTENTS and it get removed if not copying it here??
-		cp "${D}"/usr/share/doc/${PN}/net.default "${T}"/net
-		[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/
-	fi
+	# default net script is just comments, so no point in biting people
+	# in the ass by accident.  we save in preinst so that the package
+	# manager doesnt go throwing etc-update crap at us -- postinst is
+	# too late to prevent that.  this behavior also lets us keep the
+	# file in the CONTENTS for binary packages.
+	[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${D}"/etc/conf.d/
 
 	# upgrade timezone file ... do it before moving clock
 	if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then
@@ -201,20 +196,18 @@ pkg_preinst() {
 		elog "and delete /etc/conf.d/rc"
 	fi
 
-	if use oldnet; then
-		# force net init.d scripts into symlinks
-		for f in "${ROOT}"/etc/init.d/net.* ; do
-			[[ -e ${f} ]] || continue # catch net.* not matching anything
-			[[ ${f} == */net.lo ]] && continue # real file now
-			[[ ${f} == *.openrc.bak ]] && continue
-			if [[ ! -L ${f} ]] ; then
-				elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink."
-				elog "You should delete '${f##*/}.openrc.bak' if you don't need it."
-				mv "${f}" "${f}.openrc.bak"
-				ln -snf net.lo "${f}"
-			fi
-		done
-	fi
+	# force net init.d scripts into symlinks
+	for f in "${ROOT}"/etc/init.d/net.* ; do
+		[[ -e ${f} ]] || continue # catch net.* not matching anything
+		[[ ${f} == */net.lo ]] && continue # real file now
+		[[ ${f} == *.openrc.bak ]] && continue
+		if [[ ! -L ${f} ]] ; then
+			elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink."
+			elog "You should delete '${f##*/}.openrc.bak' if you don't need it."
+			mv "${f}" "${f}.openrc.bak"
+			ln -snf net.lo "${f}"
+		fi
+	done
 
 	# termencoding was added in 0.2.1 and needed in boot
 	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
@@ -238,26 +231,16 @@ pkg_preinst() {
 		esac
 	fi
 
-	if ! use oldnet; then
-		local f= links=$(find "${ROOT}"/etc/runlevels/ -name "net.*")
-		if [[ "${links}" != "" ]] ; then
-			ewarn "You have disabled installation of old-style network scripts"
-			ewarn "but they are still enabled in some runlevels:"
-			for f in $links; do
-				ewarn "\t$f"
-			done
-			ewarn "You should migrate the settings"
-			ewarn "from /etc/conf.d/net to /etc/conf.d/network"
-			ewarn "and clean runlevels from /etc/init.d/net.* and"
-			ewarn "instead add /etc/init.d/network"
-		fi
-	fi
-
 	# skip remaining migration if we already have openrc installed
-	has_version sys-apps/openrc && return 0
+	has_version sys-apps/openrc || migrate_from_baselayout_1
+}
 
+migrate_from_baselayout_1() {
 	# baselayout boot init scripts have been split out
 	for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
+		# baselayout-1 is always "old" net, so ignore "new" net
+		[[ ${f} == "network" ]] && continue
+
 		add_boot_init ${f}
 	done
 
@@ -334,10 +317,6 @@ pkg_postinst() {
 	# Remove old baselayout links
 	rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin}
 
-	if use oldnet; then
-		[[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net
-	fi
-
 	# Make our runlevels if they don't exist
 	if [[ ! -e ${ROOT}/etc/runlevels ]] || [[ -e ${ROOT}/etc/runlevels/.add_boot_init.created ]] ; then
 		einfo "Copying across default runlevels"