From 2eb1c706e622bc3b4d02f88b4fe4cb5a991c722d Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 14 Feb 2007 20:54:36 +0000 Subject: [PATCH] Adding yet another patch from Fabio Erculiani from bug #152945. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@487 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- ChangeLog | 5 +++++ generic/initrd.scripts | 12 +++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e3fa6a..8a8e022 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 14 Feb 2007; Chris Gianelloni + generic/initrd.scripts: + Adding yet another patch from Fabio Erculiani from + bug #152945. + 12 Feb 2007; Chris Gianelloni generic/initrd.scripts, generic/linuxrc, genkernel: Added a non-braindead version of a patch provided by Fabio Erculiani diff --git a/generic/initrd.scripts b/generic/initrd.scripts index 077d396..f1caef6 100644 --- a/generic/initrd.scripts +++ b/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 - if [ $? = '0' ] - then - good_msg "Addition of $2 to $1 successful" - fi + # detect branch 0 because newer unionfs doesn't support "0,1,2" + BRANCH_0="/"$(/sbin/unionctl $1 --list | cut -d/ -f2- | cut -d'(' -f1) + /sbin/unionctl $1 --add --after $BRANCH_0 --mode ro $2 + if [ $? = '0' ] + then + good_msg "Addition of $2 to $1 after branch $BRANCH_0 successful" + fi } findnfsmount() { -- 2.26.2