From 2bb12d8edd036e851e6f2ddd6230c1419ea55576 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Tue, 26 May 2009 16:11:32 +0000
Subject: add no_initrd option

---
 draklive                   | 1 +
 lib/MDV/Draklive/Initrd.pm | 1 +
 2 files changed, 2 insertions(+)

diff --git a/draklive b/draklive
index ef3e4d8..9c9c882 100755
--- a/draklive
+++ b/draklive
@@ -1435,6 +1435,7 @@ Here's a configuration sample:
              'patches/halt.loopfs.patch',
         ],
         vga_mode => 788,
+        no_initrd => 0,
     },
     media => {
         storage => 'cdrom',
diff --git a/lib/MDV/Draklive/Initrd.pm b/lib/MDV/Draklive/Initrd.pm
index 9954f6b..4147a90 100644
--- a/lib/MDV/Draklive/Initrd.pm
+++ b/lib/MDV/Draklive/Initrd.pm
@@ -270,6 +270,7 @@ sub create_classical_initrd {
     #- FIXME: use bootloader-config and allow it not to require a bootloader?
     print "using kernel $kernel\n";
     symlinkf(basename($vmlinuz_long), $root . $vmlinuz_short);
+    $live->{system}{no_initrd} and return;
 
     my $initrd_long = '/boot/initrd-'. $kernel . '.img';
     my $initrd_short = '/boot/initrd.img';
-- 
cgit v1.2.1