SVN: geninitrd/trunk/geninitrd
wiget
wiget at pld-linux.org
Thu Feb 3 11:41:43 CET 2011
Author: wiget
Date: Thu Feb 3 11:41:42 2011
New Revision: 12110
Modified:
geninitrd/trunk/geninitrd
Log:
Try to setup encryption after soft-RAID and LVM setup
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Thu Feb 3 11:41:42 2011
@@ -1298,16 +1298,19 @@
if is_yes "$have_nfs"; then
initrd_gen_nfs
-elif is_yes "$have_md"; then
- initrd_gen_md
+else
+ if is_yes "$have_md"; then
+ initrd_gen_md
+ fi
+
if is_yes "$have_lvm"; then
initrd_gen_lvm
- else
- initrd_gen_setrootdev
fi
-elif is_yes "$have_lvm"; then
- initrd_gen_lvm
-else
+
+ if is_yes "$have_luks"; then
+ initrd_gen_luks
+ fi
+
initrd_gen_setrootdev
fi
More information about the pld-cvs-commit
mailing list