From fcdc9d5967cbf861db391a777bb129afc2e2560b Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Fri, 22 Dec 2017 00:27:49 +0000 Subject: 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 --- lib/MGA/DrakISO/LiveBuild.pm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'lib/MGA/DrakISO/LiveBuild.pm') diff --git a/lib/MGA/DrakISO/LiveBuild.pm b/lib/MGA/DrakISO/LiveBuild.pm index 67561d2..7a0c006 100644 --- a/lib/MGA/DrakISO/LiveBuild.pm +++ b/lib/MGA/DrakISO/LiveBuild.pm @@ -41,7 +41,7 @@ sub new { sub default_name_fields { my ($build) = @_; - [ qw(name version product desktop), + [ qw(distro version product desktop), if_($build->{settings}{region} ne 'all', $build->{settings}{region}), qw(arch media) ]; @@ -55,11 +55,6 @@ sub get_langs { ); } -sub get_system_root { - my ($build) = @_; - $build->{settings}{chroot} . '/' . $build->get_name . $build->get_set_suffix; -} - sub find_kernel { my ($build) = @_; require bootloader; -- cgit v1.2.1