From 7ae531ff52637370d09b7a69d52844706e1f1dee Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Thu, 15 Dec 2005 18:19:29 +0000
Subject: use correct module and mount type for cdrom storage

---
 tools/draklive | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/draklive b/tools/draklive
index a30f38049..5b1b87a36 100755
--- a/tools/draklive
+++ b/tools/draklive
@@ -95,8 +95,8 @@ my %predefined = (
         },
         cdrom => {
             storage => 'cdrom',
-            fs => 'vfat',
-            source => 'LABEL=MDVUSBROOT',
+            fs => 'iso9660',
+            source => 'LABEL=MDVCDROOT',
             mountpoint => '/media',
         },
     },
@@ -123,6 +123,11 @@ sub nls_modules {
     map { "nls_$_" } (map { "iso8859-$_" } 1..7, 9, 13..15), 'utf8';
 }
 
+sub fs_module {
+    my ($live) = @_;
+    $live->{media}{fs} eq 'iso9660' ? 'isofs' : $live->{media}{fs};
+}
+
 sub progress_start {
     my ($total, $time, $o_exp_divide) = @_;
     {
@@ -298,7 +303,7 @@ sub create_initrd {
       uniq(map { modules::cond_mapping_24_26($_) } category2modules($storage{$live->{media}{storage}}{modules}));
     my ($extra_modules, $missing) = partition { exists $moddeps{$_} }
       nls_modules($live),
-      $live->{media}{fs},
+      fs_module($live),
       @{$live->{media}{modules} || []},
       (map { @{$loop{$_}{modules} || []} } uniq(map { $_->{type} } grep { $_->{type} } @{$live->{mount}{dirs} || []})),
       ($live->{mount}{overlay} ? @{$overlay{$live->{mount}{overlay}}{modules} || []} : ());
-- 
cgit v1.2.1