fixes for device creation

2 files changed, 25 insertions, 24 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 4be3b181298a..9fb228830495 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,17 +1,23 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.13 2002/03/11 12:08:38 azarah Exp $
-
-  11 March 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.7.4-r2.ebuild,
-                                                      functions.sh :
-
-  Fix functions.sh using /usr/bin/basename for users that have /usr on seperate
-  partition.
-
-  11 March 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.7.4-r1.ebuild,
-                                                      depscan.sh :
-  
-  Fix bash error if no service "provide" a virtual service.
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.14 2002/03/20 18:35:51 drobbins Exp $
+
+  20 March 2002; Daniel Robbins <drobbins@gentoo.org> : tweaked ebuild to test
+  for devfs mount by looking for /dev/.devfsd, not by catting /proc/mounts.
+  Catting /proc/mounts can give inaccurate results if you're inside a chroot
+  and your "outside" root has devfs enabled (which is normally the case,
+  really, since the CD uses devfs).  This should fix a problem where device
+  nodes don't exist after bootstrap, which causes the sys-devel/perl build to
+  fail since it cats stuff to /dev/null. (causes obscure "missing seperator
+  in makefile, line 613" error).  No rev bump for this fix.
+
+  11 March 2002; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.7.4-r2.ebuild, functions.sh : Fix functions.sh using
+  /usr/bin/basename for users that have /usr on seperate partition.
+
+  11 March 2002; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.7.4-r1.ebuild, depscan.sh : Fix bash error if no service
+  "provide" a virtual service.
 
 *baselayout-1.7.4 (10 March 2002)
 
diff --git a/sys-apps/baselayout/baselayout-1.7.4-r2.ebuild b/sys-apps/baselayout/baselayout-1.7.4-r2.ebuild
index a551b5390881..36e272807937 100644
--- a/sys-apps/baselayout/baselayout-1.7.4-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.7.4-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.7.4-r2.ebuild,v 1.2 2002/03/18 20:18:32 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.7.4-r2.ebuild,v 1.3 2002/03/20 18:35:51 drobbins Exp $
 
 SV="1.3.0"
 SVREV=""
@@ -102,15 +102,11 @@ defaltmerge() {
 	#(because it conflicts with some makefiles)
 	local ROOT
 	ROOT="`cat ${T}/ROOT`"
-	#if we are bootstrapping, we want to merge to /dev.
-	if [ -z "`use build`" ]
+	if [ -z "`use build`" ] &&  [ -e ${ROOT}/dev/.devfsd ]
 	then
-		if [ "$ROOT" = "/" ] && [ "`cat /proc/mounts | grep '/dev devfs'`" ]
-		then
-			#we're installing to our current system and have devfs enabled.  We'll need to
-			#make adjustments
-			altmerge=1
-		fi
+		# we're installing to a system that has devfs enabled; don't create device
+		# nodes.
+		altmerge=1
 	fi
 }
 
@@ -213,17 +209,16 @@ src_install()
 #	insinto /usr/bin
 #	insopts -m0755
 #	doins colors
+	keepdir /lib/dev-state
 	if [ $altmerge -eq 1 ]
 	then
 		#rootfs and devfs
-		keepdir /lib/dev-state
 		dosym /usr/sbin/MAKEDEV /lib/dev-state/MAKEDEV
 		#this is not needed anymore...
 		#keepdir /lib/dev-state/pts /lib/dev-state/shm
 	else
 		#normal
 		keepdir /dev
-		keepdir /lib/dev-state
 		keepdir /dev/pts /dev/shm
 		dosym /usr/sbin/MAKEDEV /dev/MAKEDEV
 	fi	
@@ -316,7 +311,7 @@ pkg_postinst() {
 	defaltmerge
 	# we dont 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 [ ! $altmerge -eq 1 ]
+	if [ $altmerge -eq 0 ]
 	then
 		cd ${D}/dev
 		#These devices are also needed by many people and should be included