From f7253f9c0f493c0e6d529e8bbdaf422e4008b21c Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Sat, 29 Sep 2012 21:32:58 +0000
Subject: add support for DVD media type too

---
 config/live.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'config/live.cfg')

diff --git a/config/live.cfg b/config/live.cfg
index 18595d9..3f9ff82 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -49,7 +49,7 @@ my $_l = {
             [ 'files/50-disable-suspend.pkla', '/etc/polkit-1/localauthority/50-local.d/50-disable-suspend.pkla', { mode => 0644, no_install => 1 } ],
             #- make cups the default spooler
             [ 'files/defaultspooler', '/etc/foomatic/defaultspooler', { mode => 0644 } ],
-            if_($live->{settings}{media} eq 'CD',
+            if_(member($live->{settings}{media}, 'CD', 'DVD'),
                 #- eject eject cd medium before halt/reboot
                 [ 'files/halt-local.service', '/etc/systemd/system/halt-local.service', { mode => 0644, no_install => 1 } ],
                 [ 'files/halt.local.CD', '/sbin/halt.local', { mode => 0755, no_install => 1 } ],
@@ -125,7 +125,7 @@ my $_l = {
             qw(hcfpci hsf slmodemd),
             qw(portmap nfs-common),
             qw(kav4ws freshclam clamd),
-	    if_($live->{settings}{media} eq 'CD', preload), 
+	    if_(member($live->{settings}{media}, 'CD', 'DVD'), preload),
         ],
         vga_mode => 788,
         gfxboot => $live->{settings}{media} ne 'usb', #- disable gfxboot on USB, buggy with grub on some systems
@@ -238,7 +238,7 @@ my $_l = {
         int => [ map { "i18n-$_" } qw(de en es fi fr it nl pt sv) ],
         da => [ map { "i18n-$_" } qw(da en) ],
     },
-    if_($live->{settings}{media} eq 'CD',
+    if_(member($live->{settings}{media}, 'CD', 'DVD'),
         media => {
             storage => 'cdrom',
             bootloader_timeout => 10,
-- 
cgit v1.2.1