use dracut even for live systems

1 files changed, 5 insertions, 2 deletions

diff --git a/draklive b/draklive
index 0f051a3..466f2f8 100755
--- a/draklive
+++ b/draklive
@@ -39,6 +39,9 @@ use MDV::Draklive::Initrd;
 use MDV::Draklive::Config;
 use MDV::Draklive::Storage;
 
+#- FIXME: remove completely code handling old draklive-style initrds
+my $use_dracut = 1;
+
 sub get_syslinux_path {
     my ($media, $opts) = @_;
     '/' . $media->{storage} . '/syslinux' . ($opts->{boot} && '-boot-' . $opts->{boot}) . '.cfg';
@@ -53,7 +56,7 @@ sub get_default_append {
     my ($live, $opts) = @_;
     my $append = $opts->{append} || $live->{system}{append};
     join(' ',
-         if_(!need_media_specific_boot($live),
+         if_($use_dracut || !need_media_specific_boot($live),
              'root=' . $live->{media}->get_media_source_for_nash),
          if_($live->{system}{vga_mode} && $append !~ /\bvga=\b/,
              'splash=silent',
@@ -495,7 +498,7 @@ sub create_initrd {
     run_('mount', '-t', 'proc', 'none', $root . '/proc');
     run_('mount', '-t', 'sysfs', 'none', $root . '/sys');
 
-    if (need_media_specific_boot($live)) {
+    if (!$use_dracut && need_media_specific_boot($live)) {
         MDV::Draklive::Initrd::create_media_initrd($live);
     } else {
         MDV::Draklive::Initrd::create_classical_initrd($live);