[gentoo-commits] proj/genkernel:master commit in: /, doc/, defaults/

[Sebastian Pipping]

commit:     e82a8c99854b2d710d962a82dc3a9f4c625a1373
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Wed Jun  1 01:43:08 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 01:43:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=e82a8c99

Document option lvmraid= and make it imply dolvm (bug #153502)

---
 ChangeLog           |    4 ++++
 defaults/linuxrc    |    1 +
 doc/genkernel.8.txt |    4 ++++
 3 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9670a1c..b8dcc35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  01 Jun 2011; Sebastian Pipping <sping@g.o> defaults/linuxrc,
+  doc/genkernel.8.txt:
+  Document option lvmraid= and make it imply dolvm (bug #153502)
+
   31 May 2011; Sebastian Pipping <sping@g.o> defaults/linuxrc,
   doc/genkernel.8.txt:
   Add rootfstype= boot parameter (bug #221245)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 94a2ccd..ad6d780 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -137,6 +137,7 @@ do
 		lvmraid\=*)
 			RAID_DEVICES="`parse_opt ${x}`"
 			RAID_DEVICES="`echo ${RAID_DEVICES} | sed -e 's/,/ /g'`"
+			USE_LVM_NORMAL=1
 		;;
 		part\=*)
 			MDPART=`parse_opt "${x}"`

diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index c12dca2..fb38d69 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -420,6 +420,10 @@ which the ramdisk scripts would recognize.
 *dolvm*::
     Activate LVM volumes on bootup
 
+*lvmraid*=<...>::
+    Specify RAID devices to set up before the activation of LVM volumes.
+    Implies option *dolvm*.
+
 *domdadm*::
     Scan for RAID arrays on bootup