Export myservice when starting critical services, as its needed by

some of the addons (dmcrypt for example).  Also fixup find argument
order for findutils-4.2.18+.  Fix syntax touchups to init.d/modules
clobbering return value.

Package-Manager: portage-2.0.51.19

6 files changed, 626 insertions, 21 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 7f449bc3a503..a04842b1d82c 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,20 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.218 2005/03/14 17:15:39 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.219 2005/03/15 21:44:14 azarah Exp $
 
 # See the gentoo-src rc-scripts ChangeLog for up-to-date release information:
 # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
 
+*baselayout-1.12.0_alpha1-r2 (15 Mar 2005)
+
+  15 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/baselayout-1.12.0_alpha1-export-myservice-for-critical.patch,
+  +baselayout-1.12.0_alpha1-r2.ebuild:
+  Export myservice when starting critical services, as its needed by
+  some of the addons (dmcrypt for example).  Also fixup find argument
+  order for findutils-4.2.18+.  Fix syntax touchups to init.d/modules
+  clobbering return value.
+
 *baselayout-1.11.10-r2 (14 Mar 2005)
 
   14 Mar 2005; Roy Marples <uberlord@gentoo.org>
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 11384a0f6854..70559be1c52b 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,30 +1,44 @@
-MD5 2d066147d64a6b56bd02da232305d694 ChangeLog 49545
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 32a232fb46efafb0fdaba5d5246e7572 baselayout-1.11.10-r1.ebuild 16885
+MD5 4babcf8301494aba9191eb7fa841449a ChangeLog 49986
 MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
-MD5 d124ceab1208e23c4d2b5ce5eb2a882b baselayout-1.11.10.ebuild 16827
 MD5 63fe1de96f6485a4e395d1a9132b8b33 baselayout-1.11.8-r3.ebuild 16828
 MD5 30d111c4ff4ffa5712a71ab4ac7e2c02 baselayout-1.11.9-r1.ebuild 17015
-MD5 32a232fb46efafb0fdaba5d5246e7572 baselayout-1.11.10-r1.ebuild 16885
-MD5 090789f9ee35e61ba4c68e048a474e4a baselayout-1.11.10-r2.ebuild 17000
-MD5 245dbcaff929be266ba51fe174cad7c0 baselayout-1.12.0_alpha1-r1.ebuild 16920
-MD5 7875c929dd71e995da27936c6d859717 baselayout-1.9.4-r6.ebuild 16862
 MD5 a564d6194f6a91d76d572a0f934c4faa baselayout-1.9.4-r7.ebuild 18143
-MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
-MD5 a08355653536117877945359de784f6b files/baselayout-1.11.10-iwconfig.patch 724
-MD5 f96ffe6b44684809b8ec0e4450093f59 files/baselayout-1.11.10-iwconfig-2.patch 925
-MD5 d293f00448f562c6d5b4f8bbf77a9fd1 files/baselayout-1.12.0_alpha1-fixup-depends_awk.patch 2387
+MD5 7875c929dd71e995da27936c6d859717 baselayout-1.9.4-r6.ebuild 16862
+MD5 d124ceab1208e23c4d2b5ce5eb2a882b baselayout-1.11.10.ebuild 16827
+MD5 245dbcaff929be266ba51fe174cad7c0 baselayout-1.12.0_alpha1-r1.ebuild 16920
+MD5 090789f9ee35e61ba4c68e048a474e4a baselayout-1.11.10-r2.ebuild 17000
+MD5 d61e4a00085df2dbae64d376613ccd8c baselayout-1.12.0_alpha1-r2.ebuild 17217
+MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r1 70
 MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
 MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10 70
-MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134
-MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134
+MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
+MD5 50816019be7cc03120fa58d075eb07f7 files/sysvinit-2.84-selinux1.patch 3612
+MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
 MD5 68ea8c716616fbfd5b287dadb5e9ea5c files/digest-baselayout-1.11.8-r3 69
-MD5 844ae054e507637ee440011d729858c8 files/digest-baselayout-1.11.9-r1 69
-MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r1 70
-MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r2 70
-MD5 8973ba1466f017b32112df32c15ee8a7 files/digest-baselayout-1.12.0_alpha1-r1 69
-MD5 b4092f5ec486d78aa60a04777bb840a8 files/rc-scripts-1.4.16-livecd.patch 1420
+MD5 d293f00448f562c6d5b4f8bbf77a9fd1 files/baselayout-1.12.0_alpha1-fixup-depends_awk.patch 2387
+MD5 a08355653536117877945359de784f6b files/baselayout-1.11.10-iwconfig.patch 724
 MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251
-MD5 126200ae85bdf0ef43de75411f71aaa8 files/rc-scripts-1.6.9-domainname.patch 380
+MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134
+MD5 b4092f5ec486d78aa60a04777bb840a8 files/rc-scripts-1.4.16-livecd.patch 1420
+MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r2 70
+MD5 844ae054e507637ee440011d729858c8 files/digest-baselayout-1.11.9-r1 69
+MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134
 MD5 08ade596f939beaf9f7b3657c5811593 files/rc-scripts-1.6.9-checkfs-lvm.patch 579
+MD5 126200ae85bdf0ef43de75411f71aaa8 files/rc-scripts-1.6.9-domainname.patch 380
 MD5 6ec416bfd1097d350c09e78949a736b8 files/rc-scripts-1.6.9-ifconfig.patch 266
-MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
-MD5 50816019be7cc03120fa58d075eb07f7 files/sysvinit-2.84-selinux1.patch 3612
+MD5 8973ba1466f017b32112df32c15ee8a7 files/digest-baselayout-1.12.0_alpha1-r1 69
+MD5 f96ffe6b44684809b8ec0e4450093f59 files/baselayout-1.11.10-iwconfig-2.patch 925
+MD5 4222104e326e50e3c570c82a31070138 files/baselayout-1.12.0_alpha1-export-myservice-for-critical.patch 528
+MD5 8973ba1466f017b32112df32c15ee8a7 files/digest-baselayout-1.12.0_alpha1-r2 69
+MD5 2fdc18068389dc7268dddad2bae82dfe files/baselayout-1.12.0_alpha1-modules-return-clobber.patch 550
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCN1f41ZcsMnZjRyIRAvHfAKCFA4AiFeoKlMjn0sFYaUh8AK04/gCfcjTg
+DJLXvQ9LTFoFZyyHAlBxxyY=
+=FBeJ
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout/baselayout-1.12.0_alpha1-r2.ebuild b/sys-apps/baselayout/baselayout-1.12.0_alpha1-r2.ebuild
new file mode 100644
index 000000000000..45d4d48981ef
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-1.12.0_alpha1-r2.ebuild
@@ -0,0 +1,546 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_alpha1-r2.ebuild,v 1.1 2005/03/15 21:44:14 azarah Exp $
+
+inherit flag-o-matic eutils toolchain-funcs multilib
+
+SV=1.7.0		# rc-scripts version
+SVREV=			# rc-scripts rev
+
+S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2
+	http://dev.gentoo.org/~vapier/dist/rc-scripts-${SV}${SVREV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="bootstrap build livecd static uclibc"
+
+# This version of baselayout needs gawk in /bin, but as we do not have
+# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
+# or "build" are in USE.
+RDEPEND=">=sys-apps/sysvinit-2.84
+	!build? ( !bootstrap? (
+		>=sys-libs/readline-5.0-r1
+		>=app-shells/bash-3.0-r7
+	) )"
+DEPEND="virtual/os-headers"
+PROVIDE="virtual/baselayout"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix Sparc specific stuff
+	if [[ $(tc-arch) == "sparc" ]] ; then
+		sed -i -e 's:KEYMAP="us":KEYMAP="sunkeymap":' ${S}/etc/rc.conf || die
+	fi
+
+	# Fix my booboo
+	epatch ${FILESDIR}/${P}-fixup-depends_awk.patch
+	# Export myservice when starting critical services, as its needed by
+	# some of the addons (dmcrypt for example).
+	epatch ${FILESDIR}/${P}-export-myservice-for-critical.patch
+	# Syntax changes to init.d/modules made last test clobber return.
+	epatch ${FILESDIR}/${P}-modules-return-clobber.patch
+}
+
+src_compile() {
+	use static && append-ldflags -static
+
+	make -C ${S}/src CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" \
+		CFLAGS="${CFLAGS}" || die
+}
+
+# ${PATH} should include where to get MAKEDEV when calling this
+# function
+create_dev_nodes() {
+	case ${ARCH} in
+		# amd64 must use generic-i386 because amd64/x86_64 does not have
+		# a generic option at this time, and the default 'generic' ends
+		# up erroring out, because MAKEDEV internally doesn't know what
+		# to use
+		arm)	suffix=-arm ;;
+		alpha)	suffix=-alpha ;;
+		amd64)	suffix=-i386 ;;
+		hppa)	suffix=-hppa ;;
+		ia64)	suffix=-ia64 ;;
+		m68k)	suffix=-m68k ;;
+		mips)	suffix=-mips ;;
+		ppc*)	suffix=-powerpc ;;
+		s390)	suffix=-s390 ;;
+		sparc*)	suffix=-sparc ;;
+		x86)	suffix=-i386 ;;
+	esac
+
+	einfo "Using generic${suffix} to make ${ARCH} device nodes..."
+	MAKEDEV generic${suffix}
+	MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
+}
+
+# This is a temporary workaround until bug 9849 is completely solved
+# in portage.  We need to create the directories so they're available
+# during src_install, but when src_install is finished, call unkdir
+# to remove any empty directories instead of leaving them around.
+kdir() {
+	typeset -a args
+	typeset d
+
+	# Create the directories for the remainder of src_install, and
+	# remember how to create the directories later.
+	for d in "$@"; do
+		if [[ $d == /* ]]; then
+			install -d "${args[@]}" "${D}/${d}"
+			cat >> "${D}/usr/share/baselayout/mkdirs.sh" <<EOF
+install -d ${args[@]} "\${ROOT}/${d}" 2>/dev/null \\
+	|| ewarn "  can't create ${d}"
+touch "\${ROOT}/${d}/.keep" 2>/dev/null \\
+	|| ewarn "  can't create ${d}/.keep"
+EOF
+		else
+			args=("${args[@]}" "${d}")
+		fi
+	done
+}
+
+# Continued from kdir above...  This function removes any empty
+# directories as a temporary workaround for bug 9849.  The directories
+# (and .keep files) are re-created in pkg_postinst, which means they
+# aren't listed in CONTENTS, unfortunately.
+unkdir() {
+	einfo "Running unkdir to workaround bug 9849"
+	find ${D} -depth -type d -exec rmdir {} \; 2>/dev/null
+	if [[ $? == 127 ]]; then
+		ewarn "Problem running unkdir: find command not found"
+	fi
+}
+
+src_install() {
+	local dir libdirs libdirs_env rcscripts_dir
+
+	# This directory is to stash away things that will be used in
+	# pkg_postinst; it's needed first for kdir to function
+	dodir /usr/share/baselayout
+
+	# Jeremy Huddleston <eradicator@gentoo.org>
+	# For multilib, we want to make sure that all our multilibdirs exist
+	# and make lib even if it's not listed as one (like on amd64/ppc64
+	# which sometimes has lib32/lib64 instead of lib/lib64).
+	# lib should NOT be a symlink to one of the other libdirs.
+	# Old systems with symlinks won't be affected by this change, as the
+	# symlinks already exist and won't get removed, but new systems will
+	# be setup properly.
+	#
+	# I'll be making a script to convert existing systems from symlink to
+	# nosymlink and putting it in /usr/portage/scripts.
+	libdirs=$(get_all_libdirs)
+	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+
+	# This should be /lib/rcscripts, but we have to support old profiles too.
+	if [ "${SYMLINK_LIB}" = "yes" ]; then
+		rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts"
+	else
+		rcscripts_dir="/lib/rcscripts"
+	fi
+
+	einfo "Creating directories..."
+	kdir /usr
+	kdir /usr/local
+	kdir /boot
+	kdir /dev
+	kdir /dev/pts
+	kdir /dev/shm
+	kdir /etc/conf.d
+	kdir /etc/cron.daily
+	kdir /etc/cron.hourly
+	kdir /etc/cron.monthly
+	kdir /etc/cron.weekly
+	kdir /etc/env.d
+	dodir /etc/init.d			# .keep file might mess up init.d stuff
+	kdir /etc/modules.autoload.d
+	kdir /etc/modules.d
+	kdir /etc/opt
+	kdir /home
+	kdir /lib/dev-state
+	kdir /lib/udev-state
+	kdir ${rcscripts_dir}
+	kdir ${rcscripts_dir}/awk
+	kdir ${rcscripts_dir}/sh
+	dodir ${rcscripts_dir}/net.modules.d	# .keep file messes up net.lo
+	dodir ${rcscripts_dir}/net.modules.d/helpers.d
+	kdir /mnt
+	kdir -m 0700 /mnt/cdrom
+	kdir -m 0700 /mnt/floppy
+	kdir /opt
+	kdir -o root -g uucp -m0755 /var/lock
+	kdir /proc
+	kdir -m 0700 /root
+	kdir /sbin
+	kdir /sys	# for 2.6 kernels
+	kdir /usr/bin
+	kdir /usr/include
+	kdir /usr/include/asm
+	kdir /usr/include/linux
+	kdir /usr/local/bin
+	kdir /usr/local/games
+	kdir /usr/local/sbin
+	kdir /usr/local/share
+	kdir /usr/local/share/doc
+	kdir /usr/local/share/man
+	kdir /usr/local/src
+	kdir /usr/portage
+	kdir /usr/sbin
+	kdir /usr/share/doc
+	kdir /usr/share/info
+	kdir /usr/share/man
+	kdir /usr/share/misc
+	kdir /usr/src
+	kdir -m 1777 /tmp
+	kdir /var
+	dodir /var/db/pkg			# .keep file messes up Portage
+	kdir /var/lib/misc
+	kdir /var/lock/subsys
+	kdir /var/log/news
+	kdir /var/run
+	kdir /var/spool
+	kdir /var/state
+	kdir -m 1777 /var/tmp
+
+	for dir in ${libdirs}; do
+		libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
+		[[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue
+		kdir /${dir}
+		kdir /usr/${dir}
+		kdir /usr/local/${dir}
+	done
+
+	# Ugly compatibility with stupid ebuilds and old profiles symlinks
+	if [[ ${SYMLINK_LIB} == "yes" ]] ; then
+		rm -r "${D}"/{lib,usr/lib,usr/local/lib} &> /dev/null
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
+	fi
+
+	# FHS compatibility symlinks stuff
+	dosym /var/tmp /usr/tmp
+	dosym share/man /usr/local/man
+
+	#
+	# Setup files in /etc
+	#
+	insopts -m0644
+	insinto /etc
+	find ${S}/etc -maxdepth 1 -type f -print0 | xargs --null doins
+
+	# Install some files to /usr/share/baselayout instead of /etc to keep from
+	# (1) overwriting the user's settings, (2) screwing things up when
+	# attempting to merge files, (3) accidentally packaging up personal files
+	# with quickpkg
+	fperms 0600 /etc/shadow
+	mv ${D}/etc/{passwd,shadow,group,fstab,hosts,issue.devfix} ${D}/usr/share/baselayout
+
+	cp -P ${S}/init.d/* ${D}/etc/init.d
+	chmod a+x ${D}/etc/init.d/*
+	insinto /etc/conf.d
+	doins ${S}/etc/conf.d/*
+	insinto /etc/env.d
+	doins ${S}/etc/env.d/*
+	insinto /etc/modules.autoload.d
+	doins ${S}/etc/modules.autoload.d/*
+	insinto /etc/modules.d
+	doins ${S}/etc/modules.d/*
+	insinto /etc/skel
+	find ${S}/etc/skel -maxdepth 1 -type f -print0 | xargs --null doins
+
+	# Special-case uglyness... For people updating from lib32 -> lib amd64
+	# profiles, keep lib32 in the search path while it's around
+	if has_multilib_profile && [ -d /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then
+		libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
+	fi
+
+	# List all the multilib libdirs in /etc/env/04multilib (only if they're 
+	# actually different from the normal
+	if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then
+		echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib
+	fi
+
+	# As of baselayout-1.10-1-r1, sysvinit is its own package again, and
+	# provides the inittab itself
+	rm -f "${D}"/etc/inittab
+
+	# Stash the rc-lists for use during pkg_postinst
+	cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout
+
+	# uclibc doesn't need nsswitch.conf... added by solar
+	use uclibc && rm -f ${D}/etc/nsswitch.conf
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Gentoo Base System version ${SV}" > ${D}/etc/gentoo-release
+
+	#
+	# Setup files related to /dev
+	#
+	into /
+	dosbin ${S}/sbin/MAKEDEV
+	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
+	dosym ../sbin/MAKEDEV /dev/MAKEDEV
+
+	#
+	# Setup files in /bin
+	#
+	cd ${S}/bin
+	dobin rc-status
+	if use livecd; then
+		dobin bashlogin
+	fi
+
+	#
+	# Setup files in /sbin
+	#
+	cd ${S}/sbin
+	into /
+	dosbin rc rc-update
+	# Need this in /sbin, as it could be run before
+	# /usr is mounted.
+	dosbin modules-update
+	# Compat symlinks until I can get things synced.
+	dosym modules-update /sbin/update-modules
+	dosym ../../sbin/modules-update /usr/sbin/update-modules
+	# These moved from /etc/init.d/ to /sbin to help newb systems
+	# from breaking
+	dosbin runscript.sh functions.sh
+	use livecd && dosbin livecd-functions.sh
+
+	# Compat symlinks between /etc/init.d and /sbin
+	# (some stuff have hardcoded paths)
+	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
+	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
+	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
+
+	#
+	# Setup files in /lib/rcscripts
+	# These are support files for other things in baselayout that needn't be
+	# under CONFIG_PROTECTed /etc
+	#
+	cd ${S}/sbin
+	exeinto ${rcscripts_dir}/sh
+	doexe rc-services.sh rc-daemon.sh rc-help.sh
+
+	# We can only install new, fast awk versions of scripts
+	# if 'build' or 'bootstrap' is not in USE.  This will
+	# change if we have sys-apps/gawk-3.1.1-r1 or later in
+	# the build image ...
+	if ! use build; then
+		# This is for new depscan.sh and env-update.sh
+		# written in awk
+		cd ${S}/sbin
+		into /
+		dosbin depscan.sh
+		dosbin env-update.sh
+		insinto ${rcscripts_dir}/awk
+		doins ${S}/src/awk/*.awk
+	fi
+
+	# Original design had these in /etc/net.modules.d but that is too
+	# problematic with CONFIG_PROTECT
+	dodir ${rcscripts_dir}
+	cp -a ${S}/lib/rcscripts/net.modules.d ${D}${rcscripts_dir}
+	chown -R root:root ${D}${rcscripts_dir}
+
+	#
+	# Install baselayout documentation
+	#
+	if ! use build ; then
+		doman ${S}/man/*.*
+		docinto /
+		dodoc ${FILESDIR}/copyright
+		dodoc ${S}/ChangeLog
+	fi
+
+	#
+	# Install baselayout utilities
+	#
+	cd ${S}/src
+	make DESTDIR="${D}" install || die
+
+	# Hack to fix bug 9849, continued in pkg_postinst
+	unkdir
+}
+
+pkg_preinst() {
+	if [[ -f ${ROOT}/etc/modules.autoload && \
+			! -d ${ROOT}/etc/modules.autoload.d ]]; then
+		mkdir -p ${ROOT}/etc/modules.autoload.d
+		mv -f ${ROOT}/etc/modules.autoload \
+			${ROOT}/etc/modules.autoload.d/kernel-2.4
+		ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload
+	fi
+}
+
+pkg_postinst() {
+	local x y
+
+	# Reincarnate dirs from kdir/unkdir (hack for bug 9849)
+	einfo "Creating directories and .keep files."
+	einfo "Some of these might fail if they're read-only mounted"
+	einfo "filesystems, for example /dev or /proc.  That's okay!"
+	source ${ROOT}/usr/share/baselayout/mkdirs.sh
+
+	# This could be done in src_install, which would have the benefit of
+	# (1) devices.tar.bz2 would show up in CONTENTS
+	# (2) binary installations would be faster... just untar the devices tarball
+	#     instead of needing to run MAKEDEV
+	# However the most common cases are that people are either updating
+	# baselayout or installing from scratch.  In the installation case, it's no
+	# different to have here instead of src_install.  In the update case, we
+	# save a couple minutes time by refraining from building the unnecessary
+	# tarball.
+	if [[ ! -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]]; then
+		# Create a directory in which to work
+		x=$(emktemp -d ${ROOT}/tmp/devnodes.XXXXXXXXX) \
+			&& cd "${x}" || die 'mktemp failed'
+
+		# Create temp device nodes
+		echo
+		einfo "Making device node tarball (this could take a couple minutes)"
+		PATH=${ROOT}/sbin:${PATH} create_dev_nodes
+
+		# Now create tarball that can also be used for udev.
+		# Need GNU tar for -j so call it by absolute path.
+		/bin/tar --one-file-system -cjpf "${ROOT}/lib/udev-state/devices.tar.bz2" *
+		rm -r *
+		cd ..
+		rmdir "${x}"
+	fi
+
+	# We don't want to create devices if this is not a bootstrap and devfs
+	# is used, as this was the cause for all the devfs problems we had
+	if use build || use bootstrap; then
+		if [[ ! -e "${ROOT}/dev/.devfsd" && ! -e "${ROOT}/dev/.udev" ]]; then
+			einfo "Populating /dev with device nodes..."
+			cd ${ROOT}/dev || die
+			/bin/tar xjpf "${ROOT}/lib/udev-state/devices.tar.bz2" || die
+		fi
+	fi
+
+	# Create /boot/boot symlink in pkg_postinst because sometimes
+	# /boot is a FAT filesystem.  When that is the case, then the
+	# symlink will fail.  Consequently, if we create it in
+	# src_install, then merge will fail.  AFAIK there is no point to
+	# this symlink except for misconfigured grubs.  See bug 50108
+	# (05 May 2004 agriffis)
+	ln -sn . ${ROOT}/boot/boot 2>/dev/null
+
+	# Set up default runlevel symlinks
+	# This used to be done in src_install but required knowledge of ${ROOT},
+	# which meant that it was effectively broken for binary installs.
+	if [[ -z $(/bin/ls ${ROOT}/etc/runlevels 2>/dev/null) ]]; then
+		for x in boot default nonetwork single; do
+			einfo "Creating default runlevel symlinks for ${x}"
+			mkdir -p ${ROOT}/etc/runlevels/${x}
+			for y in $(<${ROOT}/usr/share/baselayout/rc-lists/${x}); do
+				if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then
+					ewarn "init.d/${y} not found -- ignoring"
+				else
+					ln -sfn ${ROOT}/etc/init.d/${y} \
+						${ROOT}/etc/runlevels/${x}/${y}
+				fi
+			done
+		done
+	fi
+
+	# Create /etc/hosts in pkg_postinst so we don't overwrite an
+	# existing file during bootstrap
+	if [[ ! -e ${ROOT}/etc/hosts ]]; then
+		cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc
+	fi
+
+	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
+	# new users do not update them properly...  see src_install() for why they
+	# are in /usr/share/baselayout/
+	for x in passwd shadow group fstab ; do
+		if [[ -e ${ROOT}/etc/${x} ]] ; then
+			touch "${ROOT}/etc/${x}"
+		else
+			cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}"
+		fi
+	done
+
+	# Under what circumstances would mtab be a symlink?  It would be
+	# nice if there were an explanatory comment here
+	if [[ -L ${ROOT}/etc/mtab ]]; then
+		rm -f "${ROOT}/etc/mtab"
+		if [[ ${ROOT} == / ]]; then
+			cp /proc/mounts "${ROOT}/etc/mtab"
+		else
+			touch "${ROOT}/etc/mtab"
+		fi
+	fi
+
+	# We should only install empty files if these files don't already exist.
+	[[ -e ${ROOT}/var/log/lastlog ]] || \
+		touch "${ROOT}/var/log/lastlog"
+	[[ -e ${ROOT}/var/run/utmp ]] || \
+		install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp"
+	[[ -e ${ROOT}/var/log/wtmp ]] || \
+		install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp"
+
+	# Reload init to fix unmounting problems of / on next reboot.
+	# This is really needed, as without the new version of init cause init
+	# not to quit properly on reboot, and causes a fsck of / on next reboot.
+	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
+		# Regenerate init.d dependency tree
+		/sbin/depscan.sh &>/dev/null
+
+		# Regenerate /etc/modules.conf, else it will fail at next boot
+		einfo "Updating module dependencies..."
+		/sbin/modules-update force &>/dev/null
+	else
+		rm -f ${ROOT}/etc/modules.conf
+	fi
+
+	# Enable shadow groups (we need ROOT=/ here, as grpconv only
+	# operate on / ...).
+	if [[ ${ROOT} == / && \
+	     ! -f /etc/gshadow && -x /usr/sbin/grpck && -x /usr/sbin/grpconv ]]
+	then
+		if /usr/sbin/grpck -r &>/dev/null; then
+			/usr/sbin/grpconv
+		else
+			echo
+			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
+			ewarn "run 'grpconv' afterwards!"
+			echo
+		fi
+	fi
+
+	# This is also written in src_install (so it's in CONTENTS), but
+	# write it here so that the new version is immediately in the file
+	# (without waiting for the user to do etc-update)
+	rm -f ${ROOT}/etc/._cfg????_gentoo-release
+	echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release
+
+	echo
+	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
+	einfo "else things might break at your next reboot!  You can use 'etc-update'"
+	einfo "to accomplish this:"
+	einfo
+	einfo "  # etc-update"
+	echo
+
+	for f in /etc/init.d/net.eth*; do
+		[[ -L ${f} ]] && continue
+		echo
+		einfo "WARNING: You have older net.eth* files in ${ROOT}/etc/init.d/"
+		einfo "They need to be converted to symlinks to net.lo.  If you haven't"
+		einfo "made personal changes to those files, you can update with the"
+		einfo "following command:"
+		einfo
+		einfo "  # /bin/ls /etc/init.d/net.eth* | xargs -n1 ln -sfvn net.lo"
+		echo
+		break
+	done
+}
diff --git a/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-export-myservice-for-critical.patch b/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-export-myservice-for-critical.patch
new file mode 100644
index 000000000000..e7e39eca476b
--- /dev/null
+++ b/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-export-myservice-for-critical.patch
@@ -0,0 +1,16 @@
+Index: sbin/rc
+===================================================================
+RCS file: /var/cvsroot/gentoo-src/rc-scripts/sbin/rc,v
+retrieving revision 1.114
+diff -u -r1.114 rc
+--- sbin/rc	11 Mar 2005 06:02:07 -0000	1.114
++++ sbin/rc	15 Mar 2005 20:59:22 -0000
+@@ -406,6 +406,8 @@
+ 		(
+ 		local retval=
+ 		local service=$1
++		# Needed for some addons like dm-crypt that starts in critical services
++		local myservice=$1
+ 
+ 		source "/etc/init.d/${service}" || eerror "Failed to source /etc/init.d/${service}"
+ 		retval=$?
diff --git a/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-modules-return-clobber.patch b/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-modules-return-clobber.patch
new file mode 100644
index 000000000000..6216ff90c6cd
--- /dev/null
+++ b/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-modules-return-clobber.patch
@@ -0,0 +1,18 @@
+Index: init.d/modules
+===================================================================
+RCS file: /var/cvsroot/gentoo-src/rc-scripts/init.d/modules,v
+retrieving revision 1.34
+retrieving revision 1.35
+diff -u -r1.34 -r1.35
+--- init.d/modules	24 Feb 2005 01:17:24 -0000	1.34
++++ init.d/modules	11 Mar 2005 13:54:39 -0000	1.35
+@@ -117,6 +117,9 @@
+ 	# /lib/modules/boot for boot time modules we will load these modules
+ 	#
+ 	[[ -n $(modprobe -l -t boot) ]] && modprobe -a -t boot \*  &>/dev/null
++	
++	# Above test clobbers the return
++	return 0
+ }
+ 
+ 
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.0_alpha1-r2 b/sys-apps/baselayout/files/digest-baselayout-1.12.0_alpha1-r2
new file mode 100644
index 000000000000..8224a85cdd49
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-1.12.0_alpha1-r2
@@ -0,0 +1 @@
+MD5 afa07a4242fab5d085813c8e97a43345 rc-scripts-1.7.0.tar.bz2 162694