Add a small patch to help people who dont etc-update properly during their upgrade.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 38 insertions, 4 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index e3a10517d4f6..ba08ed1d537b 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.246 2005/05/30 02:55:12 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.247 2005/05/31 23:02:34 vapier 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
 
+  31 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/baselayout-1.11.12-volume-order-etc-update.patch,
+  baselayout-1.11.12-r4.ebuild:
+  Add a small patch to help people who dont etc-update properly during their
+  upgrade.
+
   29 May 2005; <solar@gentoo.org> baselayout-1.11.10-r7.ebuild,
   baselayout-1.11.11-r1.ebuild, baselayout-1.11.11-r2.ebuild,
   baselayout-1.11.11-r3.ebuild, baselayout-1.11.11.ebuild,
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index c60bc4d273d0..b93072b6ab7e 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,4 +1,4 @@
-MD5 00f3fbd7229bd4028a6c2bb018b53199 ChangeLog 56864
+MD5 4b8f400428a5d3810822a791a64bacd8 ChangeLog 57095
 MD5 acae82dc219e7456dceac35b798444e8 baselayout-1.11.9-r1.ebuild 16917
 MD5 63063133efc82df82db512614030ba19 baselayout-1.9.4-r6.ebuild 16993
 MD5 451f8ce496238c2fd0fa9fa2852ad16c baselayout-1.9.4-r7.ebuild 17999
@@ -7,12 +7,13 @@ MD5 7d6f28f70034d87817939d447d40d39e baselayout-1.11.11-r3.ebuild 18759
 MD5 780b52b2381f6d7374dd63d2746864f7 baselayout-1.11.10-r7.ebuild 17388
 MD5 3635847518d28266335ffcb3d50584bd baselayout-1.12.0_alpha2-r1.ebuild 18776
 MD5 a625569a71bae566e1e92d469dc42a35 baselayout-1.11.12-r3.ebuild 18795
-MD5 ab4be88b0a11eaa52ff689a3aac27dcf baselayout-1.11.12-r4.ebuild 18983
+MD5 0139e79190cb0800171d0984be27cd58 baselayout-1.11.12-r4.ebuild 19087
 MD5 50ccc6f432f5e941daec74f31f2d2a53 files/digest-baselayout-1.11.11-r3 70
 MD5 333c983dc00cb352f4725cacc0378fea files/baselayout-1.11.10-bridge.patch 3547
 MD5 f96ffe6b44684809b8ec0e4450093f59 files/baselayout-1.11.10-iwconfig-2.patch 925
 MD5 a08355653536117877945359de784f6b files/baselayout-1.11.10-iwconfig.patch 724
 MD5 87842ac605d85289eba63ac1c2e16142 files/baselayout-1.11.10-wireless.patch 3215
+MD5 e76b5eb42575a2c72397f4691f8e7826 files/baselayout-1.11.12-volume-order-etc-update.patch 628
 MD5 6d37e93641eee6754b93dde3324ae23b files/baselayout-1.11.11-wpa_supplicant.patch 1223
 MD5 d49b2a31706ee1e9508b188672afcf13 files/baselayout-1.12.0-alpha2-netscripts-1.patch 15665
 MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
diff --git a/sys-apps/baselayout/baselayout-1.11.12-r4.ebuild b/sys-apps/baselayout/baselayout-1.11.12-r4.ebuild
index 3819ec5ca03c..fd0f236a2505 100644
--- a/sys-apps/baselayout/baselayout-1.11.12-r4.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.12-r4.ebuild
@@ -1,6 +1,6 @@
 # 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.11.12-r4.ebuild,v 1.2 2005/05/31 22:52:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.12-r4.ebuild,v 1.3 2005/05/31 23:02:34 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -47,6 +47,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-is-net-fs.patch
 	# Remove bashisms from /etc/profile
 	epatch "${FILESDIR}"/${P}-profile.patch
+	# Help people who don't `etc-update` properly
+	epatch "${FILESDIR}"/${P}-volume-order-etc-update.patch
 
 	# setup unicode defaults for silly unicode users
 	if use unicode ; then
diff --git a/sys-apps/baselayout/files/baselayout-1.11.12-volume-order-etc-update.patch b/sys-apps/baselayout/files/baselayout-1.11.12-volume-order-etc-update.patch
new file mode 100644
index 000000000000..e0b198f08fea
--- /dev/null
+++ b/sys-apps/baselayout/files/baselayout-1.11.12-volume-order-etc-update.patch
@@ -0,0 +1,25 @@
+A small patch to work around cases where people did not properly `etc-update`.  
+This is not meant to be kept around for long, just to ease stable upgrades.
+
+This should be dropped once we've been stable for a while.
+
+--- sbin/functions.sh
++++ sbin/functions.sh
+@@ -681,7 +681,7 @@
+ start_volumes() {
+ 	local x=
+ 
+-	for x in ${RC_VOLUME_ORDER}; do
++	for x in ${RC_VOLUME_ORDER-raid evms lvm dm}; do
+ 		start_addon "${x}"
+ 	done
+ 
+@@ -705,7 +705,7 @@
+ stop_volumes() {
+ 	local x=
+ 
+-	for x in $(reverse_list ${RC_VOLUME_ORDER}); do
++	for x in $(reverse_list ${RC_VOLUME_ORDER-raid evms lvm dm}); do
+ 		stop_addon "${x}"
+ 	done
+