diff options
Diffstat (limited to 'lib')
l--------- | lib/MGA/DrakISO/.perl_checker (renamed from lib/MDV/Draklive/.perl_checker) | 0 | ||||
-rw-r--r-- | lib/MGA/DrakISO/Config.pm (renamed from lib/MDV/Draklive/Config.pm) | 10 | ||||
-rw-r--r-- | lib/MGA/DrakISO/CustomMedia.pm (renamed from lib/MDV/Draklive/CustomMedia.pm) | 2 | ||||
-rw-r--r-- | lib/MGA/DrakISO/Live.pm (renamed from lib/MDV/Draklive/Live.pm) | 2 | ||||
-rw-r--r-- | lib/MGA/DrakISO/Loopback.pm (renamed from lib/MDV/Draklive/Loopback.pm) | 12 | ||||
-rw-r--r-- | lib/MGA/DrakISO/Media.pm (renamed from lib/MDV/Draklive/Media.pm) | 10 | ||||
-rw-r--r-- | lib/MGA/DrakISO/Mounts.pm (renamed from lib/MDV/Draklive/Mounts.pm) | 2 | ||||
-rw-r--r-- | lib/MGA/DrakISO/Progress.pm (renamed from lib/MDV/Draklive/Progress.pm) | 2 | ||||
-rw-r--r-- | lib/MGA/DrakISO/Storage.pm (renamed from lib/MDV/Draklive/Storage.pm) | 10 | ||||
-rw-r--r-- | lib/MGA/DrakISO/StorageFS.pm (renamed from lib/MDV/Draklive/StorageFS.pm) | 2 | ||||
-rw-r--r-- | lib/MGA/DrakISO/Utils.pm (renamed from lib/MDV/Draklive/Utils.pm) | 2 |
11 files changed, 27 insertions, 27 deletions
diff --git a/lib/MDV/Draklive/.perl_checker b/lib/MGA/DrakISO/.perl_checker index 6246b2f..6246b2f 120000 --- a/lib/MDV/Draklive/.perl_checker +++ b/lib/MGA/DrakISO/.perl_checker diff --git a/lib/MDV/Draklive/Config.pm b/lib/MGA/DrakISO/Config.pm index dfbb596..a8b8e88 100644 --- a/lib/MDV/Draklive/Config.pm +++ b/lib/MGA/DrakISO/Config.pm @@ -1,14 +1,14 @@ -package MDV::Draklive::Config; +package MGA::DrakISO::Config; use MDK::Common; use Pod::Usage; use Cwd 'getcwd'; #- we bless Media objects here -use MDV::Draklive::Media; +use MGA::DrakISO::Media; #- these modules can be used from config files -use MDV::Draklive::Mounts; -use MDV::Draklive::CustomMedia; +use MGA::DrakISO::Mounts; +use MGA::DrakISO::CustomMedia; our $default_config_root = '/etc/draklive'; our $default_config_path = 'config/live.cfg'; @@ -80,7 +80,7 @@ sub complete_config { $live->{settings}{arch} ||= chomp_(`rpm --eval '%{_target_cpu}'`); $live->{media}{title} ||= "live"; - $_ = MDV::Draklive::Media::new($_) foreach ( + $_ = MGA::DrakISO::Media::new($_) foreach ( $live->{media}, ($live->{replicator} ? $live->{replicator}{media} : ()), ($live->{oem_rescue} ? $live->{oem_rescue}{media} : ()), diff --git a/lib/MDV/Draklive/CustomMedia.pm b/lib/MGA/DrakISO/CustomMedia.pm index 21750cd..c01d480 100644 --- a/lib/MDV/Draklive/CustomMedia.pm +++ b/lib/MGA/DrakISO/CustomMedia.pm @@ -1,4 +1,4 @@ -package MDV::Draklive::CustomMedia; +package MGA::DrakISO::CustomMedia; sub nfs_media { my ($module, $client, $path) = @_; diff --git a/lib/MDV/Draklive/Live.pm b/lib/MGA/DrakISO/Live.pm index d2adb1f..e92fc2c 100644 --- a/lib/MDV/Draklive/Live.pm +++ b/lib/MGA/DrakISO/Live.pm @@ -1,4 +1,4 @@ -package MDV::Draklive::Live; +package MGA::DrakISO::Live; use MDK::Common; diff --git a/lib/MDV/Draklive/Loopback.pm b/lib/MGA/DrakISO/Loopback.pm index 258f70e..c48f2b6 100644 --- a/lib/MDV/Draklive/Loopback.pm +++ b/lib/MGA/DrakISO/Loopback.pm @@ -1,9 +1,9 @@ -package MDV::Draklive::Loopback; +package MGA::DrakISO::Loopback; use MDK::Common; use File::Temp; -use MDV::Draklive::Progress; -use MDV::Draklive::Utils; +use MGA::DrakISO::Progress; +use MGA::DrakISO::Utils; use Exporter; our @ISA = qw(Exporter); @@ -25,7 +25,7 @@ our %loop_types; my $src = $root . $dir->{build_from}; my $total = directory_usage($src); print "have to process " . int($total/1000000) . " MB\n"; - my $progress = MDV::Draklive::Progress->new($total, time(), 6); + my $progress = MGA::DrakISO::Progress->new($total, time(), 6); my $exclude_file = tmpnam(); output_p($exclude_file, map { $root . "$_\n" } grep { -e $root . $_ } @{$dir->{exclude} || []}); my $sort = $live->{settings}{config_root} . '/' . $dir->{sort}; @@ -80,8 +80,8 @@ our %loop_types; my ($live, $dir) = @_; my $dest = $live->get_builddir . $live->{prefix}{build}{loopbacks} . $dir->{path} . $loop_types{loopfs}{extension}; mkdir_p(dirname($dest)); - MDV::Draklive::Utils::device_allocate_file($dest, $dir->{pre_allocate}); - MDV::Draklive::Utils::device_mkfs($dest, $dir->{fs}) if !defined $dir->{min_size}; + MGA::DrakISO::Utils::device_allocate_file($dest, $dir->{pre_allocate}); + MGA::DrakISO::Utils::device_mkfs($dest, $dir->{fs}) if !defined $dir->{min_size}; }, mount => sub { my ($live, $dir) = @_; diff --git a/lib/MDV/Draklive/Media.pm b/lib/MGA/DrakISO/Media.pm index 8487e29..97e21ab 100644 --- a/lib/MDV/Draklive/Media.pm +++ b/lib/MGA/DrakISO/Media.pm @@ -1,14 +1,14 @@ -package MDV::Draklive::Media; +package MGA::DrakISO::Media; use MDK::Common; -use MDV::Draklive::Storage; +use MGA::DrakISO::Storage; use POSIX; use common; sub new { my ($media) = @_; - bless $media, 'MDV::Draklive::Media'; + bless $media, 'MGA::DrakISO::Media'; $media->{partitions} ||= [ { mntpoint => '/' } ]; @@ -33,13 +33,13 @@ sub get_initrd_path { #- mainly for storage-specific subroutines sub get_storage_setting { my ($media, $setting) = @_; - $MDV::Draklive::Storage::storage_types{$media->{storage}}{$setting}; + $MGA::DrakISO::Storage::storage_types{$media->{storage}}{$setting}; } #- for actions that support an optional boot storage type sub get_boot_setting { my ($media, $setting, $opts) = @_; - $opts->{boot} ? $MDV::Draklive::Storage::storage_types{$opts->{boot}}{$setting} : get_media_setting($media, $setting); + $opts->{boot} ? $MGA::DrakISO::Storage::storage_types{$opts->{boot}}{$setting} : get_media_setting($media, $setting); } #- for user-customisable media setting, that can override storage setting diff --git a/lib/MDV/Draklive/Mounts.pm b/lib/MGA/DrakISO/Mounts.pm index 15b6947..07cd5b6 100644 --- a/lib/MDV/Draklive/Mounts.pm +++ b/lib/MGA/DrakISO/Mounts.pm @@ -1,4 +1,4 @@ -package MDV::Draklive::Mounts; +package MGA::DrakISO::Mounts; use MDK::Common; diff --git a/lib/MDV/Draklive/Progress.pm b/lib/MGA/DrakISO/Progress.pm index 128ffe3..40e442e 100644 --- a/lib/MDV/Draklive/Progress.pm +++ b/lib/MGA/DrakISO/Progress.pm @@ -1,4 +1,4 @@ -package MDV::Draklive::Progress; +package MGA::DrakISO::Progress; use POSIX qw(strftime); diff --git a/lib/MDV/Draklive/Storage.pm b/lib/MGA/DrakISO/Storage.pm index e531dc7..6402cd2 100644 --- a/lib/MDV/Draklive/Storage.pm +++ b/lib/MGA/DrakISO/Storage.pm @@ -1,4 +1,4 @@ -package MDV::Draklive::Storage; +package MGA::DrakISO::Storage; use detect_devices; @@ -6,7 +6,7 @@ our %storage_types = ( iso => { modules => 'bus/firewire|usb disk/firewire|hardware_raid|ide|sata|scsi|usb', fs => 'iso9660', - source => 'LABEL=MDVISOROOT', + source => 'LABEL=MGAISOROOT', read_only => 1, create => \&main::create_iso_master, }, @@ -15,7 +15,7 @@ our %storage_types = ( media_modules => 'disk/cdrom', fs => 'iso9660', can_hide => 0, - source => 'LABEL=MDVCDROOT', + source => 'LABEL=MGACDROOT', read_only => 1, detect => \&detect_devices::burners, create => \&main::create_cdrom_master, @@ -31,7 +31,7 @@ our %storage_types = ( fs => 'vfat', can_hide => 1, bootloader => 'grub', - source => 'LABEL=MDVUSBROOT', + source => 'LABEL=MGAUSBROOT', detect => sub { grep { detect_devices::isKeyUsb($_) } detect_devices::get() }, create => \&main::create_disk_master, format => \&main::format_disk, @@ -43,7 +43,7 @@ our %storage_types = ( harddisk => { fs => 'ext4', bootloader => 'grub', - source => 'LABEL=MDVROOT', + source => 'LABEL=MGAROOT', create => \&main::create_disk_master, format => \&main::format_disk, record => \&main::record_harddisk_master, diff --git a/lib/MDV/Draklive/StorageFS.pm b/lib/MGA/DrakISO/StorageFS.pm index 5181bae..05c62d4 100644 --- a/lib/MDV/Draklive/StorageFS.pm +++ b/lib/MGA/DrakISO/StorageFS.pm @@ -1,4 +1,4 @@ -package MDV::Draklive::StorageFS; +package MGA::DrakISO::StorageFS; use MDK::Common; diff --git a/lib/MDV/Draklive/Utils.pm b/lib/MGA/DrakISO/Utils.pm index 7637d32..1f14241 100644 --- a/lib/MDV/Draklive/Utils.pm +++ b/lib/MGA/DrakISO/Utils.pm @@ -1,4 +1,4 @@ -package MDV::Draklive::Utils; +package MGA::DrakISO::Utils; use MDK::Common; use common; |