diff options
author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-12-22 00:27:49 +0000 |
---|---|---|
committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-12-22 00:28:31 +0000 |
commit | fcdc9d5967cbf861db391a777bb129afc2e2560b (patch) | |
tree | 68e13a27e47122ec4dcce465fe64323f745a8ea2 /lib/MGA/DrakISO/Media.pm | |
parent | b52888b09904b607c8351da18affaf19e3690ee9 (diff) | |
download | drakiso-fcdc9d5967cbf861db391a777bb129afc2e2560b.tar drakiso-fcdc9d5967cbf861db391a777bb129afc2e2560b.tar.gz drakiso-fcdc9d5967cbf861db391a777bb129afc2e2560b.tar.bz2 drakiso-fcdc9d5967cbf861db391a777bb129afc2e2560b.tar.xz drakiso-fcdc9d5967cbf861db391a777bb129afc2e2560b.zip |
Numerous changes to support building classic installer ISOs:
- rename {media}{source} to {media}{label} and require the user to supply it
o automatically add the LABEL= prefix, rather than removing it
- rename {settings}{name} to {settings}{distro}
- move get_system_root() to ISOBuild - CI builds use it as the urpmi-root
- add new requirements in Config::check_config()
- rename build_live_iso() to build_iso() and support CI builds
o make output to file non-optional - we always want a file
o add the DATE.txt file to the ISO image
- modify prepare_iso_bootloader to support CI boot menus
Diffstat (limited to 'lib/MGA/DrakISO/Media.pm')
-rw-r--r-- | lib/MGA/DrakISO/Media.pm | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/MGA/DrakISO/Media.pm b/lib/MGA/DrakISO/Media.pm index f821a6c..41fa3d5 100644 --- a/lib/MGA/DrakISO/Media.pm +++ b/lib/MGA/DrakISO/Media.pm @@ -37,7 +37,7 @@ sub new { foreach my $mntpoint (qw(/ OEM_RESCUE)) { my $part = find { $_->{mntpoint} eq $mntpoint } @{$media->{partitions}}; $part->{fs_type} ||= $media->get_media_setting('fs'); - if (my $label = $mntpoint eq '/' && $media->get_media_label) { + if (my $label = $mntpoint eq '/' && $media->{label}) { $part->{device_LABEL} ||= $label; } } @@ -58,9 +58,4 @@ sub get_media_setting { $media->{$setting} || $media->get_storage_setting($setting); } -sub get_media_label { - my ($media) = @_; - first($media->get_media_setting('source') =~ /^LABEL=(.*)$/); -} - 1; |