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/ISOBuild.pm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/MGA/DrakISO/ISOBuild.pm') diff --git a/lib/MGA/DrakISO/ISOBuild.pm b/lib/MGA/DrakISO/ISOBuild.pm index 16fa36e..2f4bce9 100644 --- a/lib/MGA/DrakISO/ISOBuild.pm +++ b/lib/MGA/DrakISO/ISOBuild.pm @@ -52,6 +52,11 @@ sub get_builddir { $build->{settings}{builddir} . '/' . $build->get_name . $build->get_set_suffix . if_($o_subdir, '/' . $o_subdir); } +sub get_system_root { + my ($build) = @_; + $build->{settings}{chroot} . '/' . $build->get_name . $build->get_set_suffix; +} + sub get_absolute_path { my ($build, $path) = @_; if (defined $path && substr($path, 0, 1) ne '/') { -- cgit v1.2.1