Fix net-scripts problems related to module loading and alias management. Fix some bugs related to /dev and fsck. See rc-scripts ChangeLog for details

5 files changed, 13 insertions, 10 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index f32735ab218d..c906b1f74880 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,17 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.184 2004/10/23 20:01:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.185 2004/10/26 02:23:17 agriffis 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.11.4 (25 Oct 2004)
+
+  25 Oct 2004; Aron Griffis <agriffis@gentoo.org> -baselayout-1.11.3.ebuild,
+  +baselayout-1.11.4.ebuild:
+  Fix net-scripts problems related to module loading and alias management. Fix
+  some bugs related to /dev and fsck. See rc-scripts ChangeLog for details
+
   23 Oct 2004; Aron Griffis <agriffis@gentoo.org> baselayout-1.11.3.ebuild:
   Use rc-scripts-1.4.16-livecd.patch for baselayout-1.11.x until patch is
   applied to rc-scripts in cvs
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index ec79a6643b04..f0f5f87cf8ac 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -6,7 +6,7 @@ MD5 e8247bd1882a2f981e3c355deb8a57e8 baselayout-1.9.4-r4.ebuild 16536
 MD5 bba5d1a312678f93f33f27da9eeee00c baselayout-1.9.4-r5.ebuild 16761
 MD5 f518f7fdff8ec883cf0362a03be02165 baselayout-1.9.4-r6.ebuild 16812
 MD5 3e2d1812aa48ac5cad31adc671994ce6 ChangeLog 41680
-MD5 f6b6111bdbe47fb32173e789c70a35f9 baselayout-1.11.3.ebuild 16335
+MD5 c70af3a5d200096db6060e2fab89f191 baselayout-1.11.4.ebuild 16228
 MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
 MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
 MD5 ab3b5bbd5ce8a8b1386c834ff4a118b4 files/digest-baselayout-1.10.3 69
@@ -19,4 +19,4 @@ MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251
 MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r5 134
 MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134
 MD5 3d1b5592b9b3398edb36d29422dc0143 files/rc-scripts-1.4.16-livecd.patch 672
-MD5 b7b0cb2fd72b974da568c0e2b478dfc2 files/digest-baselayout-1.11.3 69
+MD5 c251e9b42df69559c910965caeb83c6e files/digest-baselayout-1.11.4 69
diff --git a/sys-apps/baselayout/baselayout-1.11.3.ebuild b/sys-apps/baselayout/baselayout-1.11.4.ebuild
index 5556dbe0f3e2..a0a14fb381c3 100644
--- a/sys-apps/baselayout/baselayout-1.11.3.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.3.ebuild,v 1.2 2004/10/23 20:01:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.4.ebuild,v 1.1 2004/10/26 02:23:17 agriffis Exp $
 
 inherit flag-o-matic eutils
 
-SV=1.6.3		# rc-scripts version
+SV=1.6.4		# rc-scripts version
 SVREV=			# rc-scripts rev
 
 S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
@@ -31,10 +31,6 @@ DEPEND="virtual/os-headers"
 src_unpack() {
 	unpack ${A}
 
-	# Patch that should go into rc-scripts-1.6.4
-	cd ${S}
-	epatch ${FILESDIR}/rc-scripts-1.4.16-livecd.patch
-
 	# Fix Sparc specific stuff
 	if [[ ${ARCH} == sparc ]]; then
 		sed -i -e 's:KEYMAP="us":KEYMAP="sunkeymap":' ${S}/etc/rc.conf || die
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.11.3 b/sys-apps/baselayout/files/digest-baselayout-1.11.3
deleted file mode 100644
index e0f06a702ad8..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.11.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 82df88cf1884f1a794ec4e137a282da5 rc-scripts-1.6.3.tar.bz2 141231
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.11.4 b/sys-apps/baselayout/files/digest-baselayout-1.11.4
new file mode 100644
index 000000000000..49aaad175d4d
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-1.11.4
@@ -0,0 +1 @@
+MD5 a342f39c342fb0bace3b26cb0d2a7ae5 rc-scripts-1.6.4.tar.bz2 143772