From 2d2aecaf998df3a06efe14e646039abd95822dc5 Mon Sep 17 00:00:00 2001
From: Konstantin Vlasov <konstantin.vlasov@rosalab.ru>
Date: Thu, 2 Oct 2014 17:43:50 +0400
Subject: [PATCH] Avoid activating RAIDs/etc also in EFI mode

---
 livecd-tools-21.1.efi.no.dm.luks.patch | 13 +++++++++++++
 livecd-tools.spec                      |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 livecd-tools-21.1.efi.no.dm.luks.patch

diff --git a/livecd-tools-21.1.efi.no.dm.luks.patch b/livecd-tools-21.1.efi.no.dm.luks.patch
new file mode 100644
index 0000000..12656a6
--- /dev/null
+++ b/livecd-tools-21.1.efi.no.dm.luks.patch
@@ -0,0 +1,13 @@
+diff --git a/imgcreate/live.py b/imgcreate/live.py
+index cc69c19..aba9de9 100644
+--- a/imgcreate/live.py
++++ b/imgcreate/live.py
+@@ -819,6 +819,8 @@ search --no-floppy --set=root -l '%(isolabel)s'
+         else:
+             long = self.product
+ 
++        kernel_options += " rd.luks=0 rd.md=0 rd.dm=0"
++
+         for index in range(0, 9):
+             # we don't support xen kernels
+             if os.path.exists("%s/EFI/BOOT/xen%d.gz" %(isodir, index)):
diff --git a/livecd-tools.spec b/livecd-tools.spec
index 39ca2c4..dd1c73e 100644
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
@@ -25,6 +25,7 @@ Patch8: livecd-tools-21.1.isolinux.plymouth.fixes.patch
 Patch9: livecd-tools-21.1.efi.grub.cfg.patch
 Patch10: livecd-tools-21.1.pkg.installation.fix.patch
 Patch11: livecd-tools-21.1.drop.initramfs.patch
+Patch12: livecd-tools-21.1.efi.no.dm.luks.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-imgcreate = %{epoch}:%{version}-%{release}
@@ -85,6 +86,7 @@ like live image or appliances.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 make