This fixes #443996 and #445116.

Also, we now unmount /usr if it was not pre-mounted by an initramfs on
Linux systems.
I am taking this to stable on all arches where 0.11.5 was stable because
these issues were not reported to me until we started stabilizing.

Package-Manager: portage-2.2.0_alpha143/cvs/Linux i686
RepoMan-Options: --force
Manifest-Sign-Key: 0x30C46538

3 files changed, 497 insertions, 5 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index d28bfe2f6a87..3a0df8ce3207 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,15 @@
 # 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.246 2012/11/25 06:12:19 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.247 2012/11/30 19:17:52 williamh Exp $
+
+*openrc-0.11.6 (30 Nov 2012)
+
+  30 Nov 2012; William Hubbs <williamh@gentoo.org> +openrc-0.11.6.ebuild:
+  This fixes #443996 and #445116.
+  Also, we now unmount /usr if it was not pre-mounted by an initramfs on
+  Linux systems.
+  I am taking this to stable on all arches where 0.11.5 was stable because
+  these issues were not reported to me until we started stabilizing.
 
   25 Nov 2012; William Hubbs <williamh@gentoo.org> ChangeLog:
   sign manifest; the previous commit was mine as well. signing was not
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index ac24c410fcaa..b89a537695e3 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -9,17 +9,19 @@ AUX openrc.logrotate 71 SHA256 0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7
 AUX start-stop-daemon.pam 63 SHA256 2681da17e4a122656b5303b7c7eca82b8fb182641290b153fdbe96b63638086d SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb WHIRLPOOL 4abc9f051155a62d3033258a06003a4ca3909d8104deca84d5c1605bc1c7e56167fd82b2b4b72fe7b707070de98a7628730de1ad3f14b924b5b1480fba5ef854
 DIST openrc-0.10.5.tar.bz2 171742 SHA256 27677142a7aa47a1c7e863fd4bce0d092aca7870012812e4f7a690a14f1e242c SHA512 f855d5f1b115cc4387585b9533fba78d22b7c54379a26e3d26995c1ff5b3bbe11bb6e6adc715d35710fcff77449d23bcdbbd4fbb5ea74e66a2ba224dfe2746e3 WHIRLPOOL f39a88e1f44f741f8eb31db07e5bb199253912d5c3cc7d9006467d52e07d5b814c1e3d2d652e1b503a5a81b953be094d2c95a50397812301f76abef6e44c608f
 DIST openrc-0.11.5.tar.bz2 174650 SHA256 f0c3ff6e51adc5fd10c355d76d1ee20773154da6b8415f461f5dab9ff75d6453 SHA512 0f35dc8940f577c863de659813ee296f002fd7038d953fa7eeb4bdbd793cc853c43f0dd7f0fda5fa81bcfed9efccbee2e26dbc78955ed98a7600644c80320af2 WHIRLPOOL b89c75143d0ec69be59f272197b48b4df50bc2cfd581de81e17641ae0abc6165f43151947be47b84000c7f7cb07ca3e80f87d9ee5a7f93822a6e5f613953e78e
+DIST openrc-0.11.6.tar.bz2 174888 SHA256 60b409d2236d531e45ebd82ef258859249a703f8994076cee560735f95ee6e9b SHA512 9f6c4335704d441dd0cd014ab2c1a44dd409d25be478a704ca432fa2d21697a6f4f93876c251c30f675183dbd55292c04e450884f0d2ea2c13d24fcaec3008f9 WHIRLPOOL f1017ebeb9188cdef15c469486157e9aec51afc8568bd7eea02cc0cf42981baa408d2fc011104058afc1b43f3b07e4ea2088ef4dff28f07281994cd6c28748e3
 DIST openrc-0.9.8.4.tar.bz2 166843 SHA256 904e139a90d5f610b59f9e0cc52ddac487c58e4fa73468b5e9fdac1a03362533 SHA512 27227fb0fcf0c830ddc39e6c91e5adb5d1e56cb2a50ca0148bb22c5ea587c7e492a50e066d1f34c7cd4f7869a12edcd71f25602468b838aed8fbc1ddafc9ac6e WHIRLPOOL db183bf0d5a041a95f0cc5b636f16b90b7a57c9e696b7ed67f4e31dde2731ffb2383eaffa8e6ad9955785a6632e8e44089cb900fc6c1a848149b3f37fddc30fa
 EBUILD openrc-0.10.5.ebuild 14421 SHA256 a3de4203ca5221570a679db74083198b03a6a6a5439788a5fda0ed2452e99bf4 SHA512 17c342ef9f3bd8be978fbec3425cebb78c3c5ac262b121bec69ebb01f0c8ddc2d07d033d6a29f37df2de13935b811c251e862be9a41ae07f3423d229ecaa9b2d WHIRLPOOL 25e1144188ab066ddc42015c52a5bff55d0d2a499918debc4e614606bb8809b2de294574116e0290a609f5afef453a2ed537207379c06c23d11dc58e43fcbc8b
 EBUILD openrc-0.11.5.ebuild 16229 SHA256 7760c01871e7505525c72f293c691d34126836fbe02dbdb9c390b70fc807b984 SHA512 78528abd67dbb3a86b394545b97e0fab34f095a46f51230b1159f02a70a596dd42778c4d76f569a94311edd6eab2db09b6ab50aa38fc3e77efe3bcaf332098c8 WHIRLPOOL 20d77c7d4b74bba9657188eca0c8155b757ddfb4b46b3eec88efeb6aed5fdb9d526682453ed33cb4100bac6d68a174ee2e99ebf46221a735ad91516daa755b66
+EBUILD openrc-0.11.6.ebuild 16229 SHA256 3117436da21ef9ef26e38b0f60263f85888a68c71b5a258d19f72ab22e908bcf SHA512 4451d04cfede52d4093c5a8294c1e1505f8b27b9498c93c13f2236197158a07ec50047ba3c8bf3c92ba142fa7365c800c86e0ccb70d88a569efc447ade03e93f WHIRLPOOL b4dc2c07bd0457f9883f357c48deffe20987630c4706be37da4cf3e676a390f33b9827ab459f693a28bf63b19c030eb0f42bfdebdf740f8154c7d7ac93878b36
 EBUILD openrc-0.9.8.4.ebuild 13967 SHA256 dd100aaaf00fe0f46008cda1a0b12a6753bd6019cb606d747f0edefc7b359468 SHA512 6a958bea4c0cc6f9adcdba07a2c193e04aaa48f39a5d27329a5ede5d1be97fb967e96751d1450c9ac60b3e194445f9422892865fd7f53d6c2d540c17624d4f2f WHIRLPOOL 62bc0da6afa4b5b9a7f52678b727e489c540c82d0dec2ad503e1fb84ce4f3dc357f7f9ad81cdb99216fef1d156b467e2e3ad0cdde52d360d0924ac7caa019ad4
 EBUILD openrc-9999.ebuild 16232 SHA256 36782a33e944d5344ae3a6ce6d2ca960505896004765d230789198fa16178a42 SHA512 1af2ac66608ecbe09227b635ad0e423de0a6ae0bfd82b5f18ee1d5bb231eda9060d98d76249bbe90f4746302edeffd8f8f6a68907f46504439741454aedb1f6c WHIRLPOOL 3aef51bc1b91e23c75f494c502edbd065c9e911d21202ecfe5eb6937ee62d1305a6359912074079743b0b360e7f605bdd3365c56a0bbcef9bc6cc214ea43182a
-MISC ChangeLog 42150 SHA256 2f3ee9027b7357746e9bf04d5f441318e75deca607881cc7f2407681943ab8d2 SHA512 f131ba977efb5cb6ff755e5a0bd26e224aa4e50ca36fda8eecdd5d70bacf750dab1fb505b42266fd913d39e26102f355a3d66c03b7d409cb7dbc8d0a57a19070 WHIRLPOOL 3f901b26d9222b1c38efa1f14b8fcbe82d738b8cfaf2926e497494a58d1870fd11011ea73609e313e099aaf2cc2ec57e0cbda890f2bb88c1b6da8f1b41f55f25
+MISC ChangeLog 42523 SHA256 c2db4bdbc76b78abd19d71b9831ffd0ab85b5f451a329d2a4be4757a032c3f04 SHA512 e3c51aac9654725a242af4721762850ad481b42aae971b3d648bbbc0bba8797ca041e9a82a0a2821e20389e128ecf51d35eeea0f87158945a89d09a1712e0dbc WHIRLPOOL 23ce09238deae954a80029f02678119d41776c22b53f4b8a29b303df96b1743c3af52af4f048eb11e7076017f37a329e15fd0a98c9bf1dd40f283ad63a730f03
 MISC metadata.xml 248 SHA256 1e50acb4e0c7b890089cafec26f902ce9b4c06a877905618aee0f020da8ae8cc SHA512 e71772c01a76d089da16f089a8ca01cc3356d0d0a97d804b996c4f215009eefe06bd2770ff23bb98a29820d0dca55f434e1e99f963357309c2f1813a5420f121 WHIRLPOOL ca0cc96027f581e2b671a3f00ba549204d999cfc93d3837be38ea7023222ed212cf786b4a50174087a64bcf284825751f44a99f228887222944c73f9d6940333
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCxtswACgkQblQW9DDEZTg3FACgoJdAB+cbp7RgDCB8l34giznz
-DZ8Ani5RfPCr/NUGIrq5vTAUGHFariLt
-=HDDY
+iEYEAREIAAYFAlC5BqcACgkQblQW9DDEZThXoACghSG/v5aO407euodMhQ5hxJKK
+FogAoJttLt14j1ulDPQhbG+ZppF9YAQE
+=Wgbd
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-0.11.6.ebuild b/sys-apps/openrc/openrc-0.11.6.ebuild
new file mode 100644
index 000000000000..033ece941b51
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.11.6.ebuild
@@ -0,0 +1,481 @@
+# 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-0.11.6.ebuild,v 1.1 2012/11/30 19:17:52 williamh Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic multilib pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git"
+	inherit git-2
+else
+	SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="debug elibc_glibc ncurses pam newnet prefix selinux static-libs unicode
+	kernel_linux kernel_FreeBSD"
+
+RDEPEND="virtual/init
+	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	elibc_glibc? ( >=sys-libs/glibc-2.5 )
+	ncurses? ( sys-libs/ncurses )
+	pam? ( sys-auth/pambase )
+	>=sys-apps/baselayout-2.1-r1
+	kernel_linux? (
+		sys-process/psmisc
+	)
+	!<sys-fs/udev-init-scripts-17
+	!<sys-fs/udev-133"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+src_prepare() {
+	sed -i 's:0444:0644:' mk/sys.mk || die
+	sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+	fi
+
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc"
+
+	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
+	if use selinux; then
+			MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	if ! use static-libs; then
+			MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no"
+	fi
+	use newnet || MAKE_ARGS="${MAKE_ARGS} MKNET=oldnet"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKPAM=$(usev pam)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# 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 "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /$(get_libdir)/rc/init.d
+	fi
+	keepdir /$(get_libdir)/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Install the default net configuration
+	doconfd conf.d/net
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install the gentoo pam.d file
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${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 "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf "${EROOT}"etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${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 "${EROOT}"etc/conf.d/net ]] && \
+		cp "${EROOT}"etc/conf.d/net "${ED}"/etc/conf.d/
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# upgrade timezone file ... do it before moving clock
+	if [[ -e ${EROOT}etc/conf.d/clock && ! -e ${EROOT}/etc/timezone ]] ; then
+		(
+		unset TIMEZONE
+		source "${EROOT}"etc/conf.d/clock
+		[[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${EROOT}"etc/timezone
+		)
+	fi
+
+	# /etc/conf.d/clock moved to /etc/conf.d/hwclock
+	local clock
+	use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock"
+	if [[ -e "${EROOT}"etc/conf.d/clock ]] ; then
+		mv "${EROOT}"etc/conf.d/clock "${EROOT}"etc/conf.d/${clock}
+	fi
+	if [[ -e "${EROOT}"etc/init.d/clock ]] ; then
+		rm -f "${EROOT}"etc/init.d/clock
+	fi
+	if [[ -L "${EROOT}"etc/runlevels/boot/clock ]] ; then
+		rm -f "${EROOT}"etc/runlevels/boot/clock
+		ln -snf /etc/init.d/${clock} "${EROOT}"etc/runlevels/boot/${clock}
+	fi
+	if [[ -L "${EROOT}"${LIBDIR}/rc/init.d/started/clock ]] ; then
+		rm -f "${EROOT}"${LIBDIR}/rc/init.d/started/clock
+		ln -snf /etc/init.d/${clok} "${EROOT}"${LIBDIR}/rc/init.d/started/${clock}
+	fi
+
+	# /etc/conf.d/rc is no longer used for configuration
+	if [[ -e "${EROOT}"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 "${EROOT}"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
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	has_version sys-apps/openrc || migrate_from_baselayout_1
+	has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+}
+
+# >=openrc-0.4.0 no longer loads the udev addon
+migrate_udev_init_script() {
+	# make sure udev is in sysinit if it was enabled before
+	local enable_udev=false
+	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=true
+			;;
+	esac
+
+	if $enable_udev; then
+		add_boot_init udev sysinit
+		add_boot_init udev-postmount default
+	fi
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+migrate_from_baselayout_1() {
+	# baselayout boot init scripts have been split out
+	for f in $(cd "${ED}"/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 "${EROOT}"sbin/dmsetup ]] && add_boot_init device-mapper
+	[[ -e "${EROOT}"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 our state for baselayout-1 users
+	if [[ ! -e "${EROOT}"${LIBDIR}/rc/init.d/started ]] ; then
+		(
+		[[ -e "${EROOT}"etc/conf.d/rc ]] && source "${EROOT}"/etc/conf.d/rc
+		svcdir=${svcdir:-/var/lib/init.d}
+		if [[ ! -d "${EROOT}"${svcdir}/started ]] ; then
+			ewarn "No state found, and no state exists"
+			elog "You should reboot this host"
+		else
+			mkdir -p "${EROOT}"${LIBDIR}/rc/init.d
+			einfo "Moving state from ${EROOT}${svcdir} to ${EROOT}${LIBDIR}/rc/init.d"
+			mv "${EROOT}${svcdir}"/* "${EROOT}${LIBDIR}"/rc/init.d
+			rm -rf "${EROOT}${LIBDIR}"/rc/init.d/daemons \
+				"${EROOT}${LIBDIR}"/rc/init.d/console
+			umount "${EROOT}${svcdir}" 2>/dev/null
+			rm -rf "${EROOT}${svcdir}"
+		fi
+		)
+	fi
+
+	# Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition
+	if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then
+		elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules"
+		rm -f "${EROOT}"etc/modules.autoload.d/.keep*
+		rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null
+		if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then
+			local f v
+			for f in "${EROOT}"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}" >> "${ED}"/etc/conf.d/modules
+			done
+				rm -f "${f}"
+			rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null
+		fi
+	fi
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Remove old baselayout links
+	rm -f "${EROOT}"etc/runlevels/boot/{check{fs,root},rmnologin}
+	rm -f "${EROOT}"etc/init.d/{depscan,runscript}.sh
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+	fi
+
+	# /etc/conf.d/net.example is no longer valid
+	local NET_EXAMPLE="${EROOT}etc/conf.d/net.example"
+	local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210'
+	if [[ -e "${NET_EXAMPLE}" ]] ; then
+		if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then
+			rm -f "${NET_EXAMPLE}"
+			elog "${NET_EXAMPLE} has been removed."
+		else
+			sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}"
+			elog "${NET_EXAMPLE} should be removed."
+		fi
+		elog "The new file is ${EROOT}usr/share/doc/${PF}/net.example"
+	fi
+
+	# /etc/conf.d/wireless.example is no longer valid
+	local WIRELESS_EXAMPLE="${EROOT}etc/conf.d/wireless.example"
+	local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3'
+	if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then
+		if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then
+			rm -f "${WIRELESS_EXAMPLE}"
+			elog "${WIRELESS_EXAMPLE} is deprecated and has been removed."
+		else
+			sed -i '1i# This file is obsolete.\n' "${WIRELESS_EXAMPLE}"
+			elog "${WIRELESS_EXAMPLE} is deprecated and should be removed."
+		fi
+		elog "If you are using the old style network scripts,"
+		elog "Configure wireless settings in ${EROOT}etc/conf.d/net"
+		elog "after reviewing ${EROOT}usr/share/doc/${PF}/net.example"
+	fi
+
+	if [[ -d "${EROOT}"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
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Handle the conf.d/local.{start,stop} -> local.d transition
+	if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
+		elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
+		elog "files to ${EROOT}etc/local.d"
+		mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
+		mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
+		chmod +x "${EROOT}"etc/local.d/*{start,stop}
+	fi
+
+	if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
+		if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+			ewarn "The dependency data could not be migrated to /run/openrc."
+			ewarn "This means you need to reboot your system."
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
+	if use newnet; then
+		local netscript=network
+	else
+		local netscript=net.lo
+	fi
+
+	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
+
+	ewarn "In this version of OpenRC, the loopback interface no longer"
+	ewarn "satisfies the net virtual."
+	ewarn "If you have services now which do not start because of this,"
+	ewarn "They can be fixed by adding rc_need=\"!net\""
+	ewarn "to the ${EROOT}etc/conf.d/<servicename> file."
+	ewarn "You should also file a bug against the service asking that"
+	ewarn "need net be dropped from the dependencies."
+	ewarn "The bug you file should block the following tracker:"
+	ewarn "https://bugs.gentoo.org/show_bug.cgi?id=439092"
+
+	ewarn "This version of OpenRC doesn't enable nfs mounts automatically any"
+	ewarn "longer. In order to mount nfs file systems, you must use the"
+	ewarn "nfsmount service from the nfs-utils package."
+	ewarn "See bug https://bugs.gentoo.org/show_bug.cgi?id=427996 for"
+	ewarn "more information on this."
+
+	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"
+}