Adding yet another patch from Fabio Erculiani <lxnay@lxnaydesign.net> from bug #152945.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@487 67a159dc-881f-0410-a524-ba9dfbe2cb84

ChangeLog

@@ -2,6 +2,11 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  generic/initrd.scripts:
+  Adding yet another patch from Fabio Erculiani <lxnay@lxnaydesign.net> from
+  bug #152945.
+
   12 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   generic/initrd.scripts, generic/linuxrc, genkernel:
   Added a non-braindead version of a patch provided by Fabio Erculiani

generic/initrd.scripts

@@ -147,11 +147,13 @@ mount_sysfs() {
 # $2 = path to data directory
 #
 union_insert_dir() {
-   /sbin/unionctl $1 --add --after 0 --mode ro $2
+	# detect branch 0 because newer unionfs doesn't support "0,1,2"
-   if [ $? = '0' ]
+	BRANCH_0="/"$(/sbin/unionctl $1 --list | cut -d/ -f2- | cut -d'(' -f1)
-   then
+	/sbin/unionctl $1 --add --after $BRANCH_0 --mode ro $2
-   	good_msg "Addition of $2 to $1 successful"
+	if [ $? = '0' ]
-   fi
+	then
+		good_msg "Addition of $2 to $1 after branch $BRANCH_0 successful"
+	fi
 }
 
 findnfsmount() {