summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-10-29 01:08:41 +0000
committerOlivier Blin <oblin@mandriva.com>2008-10-29 01:08:41 +0000
commit9d72ca859466afda92bb67fec4651048820a84ed (patch)
tree16987e1db1f5e78a56b6d3a5a13e0d0909b3eb42
parent9f4c79a78e6ff119931f1f5643f7482ca2dc9c18 (diff)
downloaddraklive-9d72ca859466afda92bb67fec4651048820a84ed.tar
draklive-9d72ca859466afda92bb67fec4651048820a84ed.tar.gz
draklive-9d72ca859466afda92bb67fec4651048820a84ed.tar.bz2
draklive-9d72ca859466afda92bb67fec4651048820a84ed.tar.xz
draklive-9d72ca859466afda92bb67fec4651048820a84ed.zip
move Mounts and CustomMedia usage to Config module, since they are to be used from config files
-rwxr-xr-xdraklive2
-rw-r--r--lib/MDV/Draklive/Config.pm4
2 files changed, 4 insertions, 2 deletions
diff --git a/draklive b/draklive
index 7c33ca8..58f5dd6 100755
--- a/draklive
+++ b/draklive
@@ -38,8 +38,6 @@ use MDV::Draklive::Media;
use MDV::Draklive::Progress;
use MDV::Draklive::Loopback;
use MDV::Draklive::Initrd;
-use MDV::Draklive::Mounts;
-use MDV::Draklive::CustomMedia;
use MDV::Draklive::Config;
my %storage = (
diff --git a/lib/MDV/Draklive/Config.pm b/lib/MDV/Draklive/Config.pm
index 3172d80..0e01d7e 100644
--- a/lib/MDV/Draklive/Config.pm
+++ b/lib/MDV/Draklive/Config.pm
@@ -4,6 +4,10 @@ use MDK::Common;
use Pod::Usage;
use Cwd 'getcwd';
+#- these modules can be used from config
+use MDV::Draklive::Mounts;
+use MDV::Draklive::CustomMedia;
+
our $default_config_root = '/etc/draklive';
our $default_config_path = 'config/live.cfg';
our $default_settings_path = 'config/settings.cfg';