From 5546e3969b03f049ec473df798ba5c8c654b86cb Mon Sep 17 00:00:00 2001
From: Roy Marples <uberlord@gentoo.org>
Date: Tue, 31 Oct 2006 14:57:54 +0000
Subject: [PATCH] Don't intall /dev/{console,null} as that messes vservers
 apparently. Package-Manager: portage-2.1.2_rc1-r1

---
 sys-apps/baselayout/ChangeLog                    |  3 ++-
 sys-apps/baselayout/Manifest                     | 16 ++++++++--------
 .../baselayout/baselayout-1.13.0_alpha4.ebuild   |  9 +--------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index b4c65070ee2c..eabeced7dd94 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.357 2006/10/31 09:01:03 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.358 2006/10/31 14:57:54 uberlord Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
@@ -10,6 +10,7 @@
   31 Oct 2006; Roy Marples <uberlord@gentoo.org>
   +baselayout-1.13.0_alpha4.ebuild:
   New version, should work with catalyst now, #153057.
+  Don't intall /dev/{console,null} as that messes vservers apparently.
 
 *baselayout-1.13.0_alpha3 (24 Oct 2006)
 
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index dc640f8aa210..3a924d161838 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -126,14 +126,14 @@ EBUILD baselayout-1.13.0_alpha3.ebuild 8840 RMD160 2c88750b55617b5e912d74e449111
 MD5 74f5f694a2032510e85c1daab17642b5 baselayout-1.13.0_alpha3.ebuild 8840
 RMD160 2c88750b55617b5e912d74e44911181bb1d79c7e baselayout-1.13.0_alpha3.ebuild 8840
 SHA256 52df0f11416aa7582258ce335f0178b2d0bf94486b87f9734e5270b69a38db3f baselayout-1.13.0_alpha3.ebuild 8840
-EBUILD baselayout-1.13.0_alpha4.ebuild 9396 RMD160 82834f10e4bc481cc5251a565c60ff07b157b652 SHA1 0abf14a76fa2faee3c78511b0411d42f899430ab SHA256 457f606f5d5e422b385bb74ff9ee03b3b87335a84c0fb7d72bf8468cbcf3fc0d
-MD5 b8a516577d0bff83976b7fede8e67cff baselayout-1.13.0_alpha4.ebuild 9396
-RMD160 82834f10e4bc481cc5251a565c60ff07b157b652 baselayout-1.13.0_alpha4.ebuild 9396
-SHA256 457f606f5d5e422b385bb74ff9ee03b3b87335a84c0fb7d72bf8468cbcf3fc0d baselayout-1.13.0_alpha4.ebuild 9396
-MISC ChangeLog 81182 RMD160 0dda120b77579cef521b59fd3521fcf34ad4351d SHA1 1384d658651bdc1c09d8c6ee06e6cd1992f78832 SHA256 610f1c2f4857749b780f39a1886f5f583f110c668bd34d0168915fa3c56d714c
-MD5 4e605bcfe86dc3a790442d2a4a8153b4 ChangeLog 81182
-RMD160 0dda120b77579cef521b59fd3521fcf34ad4351d ChangeLog 81182
-SHA256 610f1c2f4857749b780f39a1886f5f583f110c668bd34d0168915fa3c56d714c ChangeLog 81182
+EBUILD baselayout-1.13.0_alpha4.ebuild 9086 RMD160 0748d0c35c7296e154138478254edfdaf501556b SHA1 c5621fb28fa94125a1e0c0cbb684cf9635523220 SHA256 0c4b5f1fd4fc75a29741a8d2bb872a75a4a8aa93fffc31ec8d68d713d8cd1483
+MD5 89fe580a63cdf58624f048520d6408b2 baselayout-1.13.0_alpha4.ebuild 9086
+RMD160 0748d0c35c7296e154138478254edfdaf501556b baselayout-1.13.0_alpha4.ebuild 9086
+SHA256 0c4b5f1fd4fc75a29741a8d2bb872a75a4a8aa93fffc31ec8d68d713d8cd1483 baselayout-1.13.0_alpha4.ebuild 9086
+MISC ChangeLog 81253 RMD160 2a3ccfdc2f6f3f98dae9a31710302af45450425e SHA1 80339dc2820fa7034f1e5a3b2311651986b94965 SHA256 3c84a99dbbca2cb6cc15f307b5d09fad193801e1abe9fbff535d8e85ccb53421
+MD5 a097a018cb2728bab211981e434beb7c ChangeLog 81253
+RMD160 2a3ccfdc2f6f3f98dae9a31710302af45450425e ChangeLog 81253
+SHA256 3c84a99dbbca2cb6cc15f307b5d09fad193801e1abe9fbff535d8e85ccb53421 ChangeLog 81253
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha4.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha4.ebuild
index be57f381cee1..59cc2941739a 100644
--- a/sys-apps/baselayout/baselayout-1.13.0_alpha4.ebuild
+++ b/sys-apps/baselayout/baselayout-1.13.0_alpha4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.13.0_alpha4.ebuild,v 1.1 2006/10/31 09:01:03 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.13.0_alpha4.ebuild,v 1.2 2006/10/31 14:57:54 uberlord Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -160,13 +160,6 @@ pkg_postinst() {
 				PATH="${ROOT}"/sbin:${PATH} make -C "${T}" $(make_opts) \
 					dev || die "failed to create /dev nodes"
 			fi
-		elif [[ -w ${ROOT} ]] ; then
-			# Ensure that we have /dev/null and /dev/console at least
-			einfo "Ensuring that /dev/null and /dev/console exist on ${ROOT}dev"
-			mkdir "${T}"/dev
-			mount -o bind / "${T}/dev"
-			make -C "${T}" DESTDIR="${T}/dev" ARCH="$(tc-arch)" basedev &>/dev/null
-			umount "${T}/dev"
 		fi
 	fi
 
-- 
2.26.2