diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2007-02-14 20:54:36 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2007-02-14 20:54:36 +0000 |
| commit | 2eb1c706e622bc3b4d02f88b4fe4cb5a991c722d (patch) | |
| tree | 9f7fb0b5286ba72e321ee773b32fb34b7f677908 /generic | |
| parent | Added a non-braindead version of a patch provided by Fabio Erculiani <lxnay@l... (diff) | |
| download | genkernel-2eb1c706e622bc3b4d02f88b4fe4cb5a991c722d.tar.gz genkernel-2eb1c706e622bc3b4d02f88b4fe4cb5a991c722d.tar.bz2 genkernel-2eb1c706e622bc3b4d02f88b4fe4cb5a991c722d.zip | |
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
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/initrd.scripts | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/generic/initrd.scripts b/generic/initrd.scripts index 077d3967..f1caef6d 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() { |