summaryrefslogtreecommitdiffstats
path: root/lib/MGA/DrakISO/BuildRoot.pm
diff options
context:
space:
mode:
Diffstat (limited to 'lib/MGA/DrakISO/BuildRoot.pm')
-rwxr-xr-xlib/MGA/DrakISO/BuildRoot.pm19
1 files changed, 9 insertions, 10 deletions
diff --git a/lib/MGA/DrakISO/BuildRoot.pm b/lib/MGA/DrakISO/BuildRoot.pm
index 7112cd9..20ad645 100755
--- a/lib/MGA/DrakISO/BuildRoot.pm
+++ b/lib/MGA/DrakISO/BuildRoot.pm
@@ -40,7 +40,7 @@ sub install_live_system {
my $drakx_in_chroot = $repository . '/misc/drakx-in-chroot';
my $remote_repository = $repository =~ m!^(ftp|http)://! && $1;
if ($remote_repository) {
- my $local_drakx_in_chroot = $live->get_builddir . $live->{prefix}{build}{scripts} . '/drakx-in-chroot';
+ my $local_drakx_in_chroot = $live->get_builddir('scripts') . '/drakx-in-chroot';
mkdir_p(dirname($local_drakx_in_chroot));
run_('curl', '--silent', '-o', $local_drakx_in_chroot, $drakx_in_chroot)
or die "unable to get drakx-in-chroot from remote repository\n";
@@ -162,12 +162,12 @@ sub customise_live_system {
my @no_install_files = map { $_->[1] } grep { $_->[2] && $_->[2]{no_install} } @{$live->{system}{files}};
output_p($live->get_system_root . '/etc/draklive-install.d/remove.d/draklive', map { "$_\n" } @no_install_files);
- eval { rm_rf($live->get_builddir . $live->{prefix}{build}{files}) };
- mkdir_p($live->get_builddir . $live->{prefix}{build}{files});
+ eval { rm_rf($live->get_builddir('files')) };
+ mkdir_p($live->get_builddir('files'));
if ($live->{media}{files}) {
- copy_files_to($live, $live->{media}{files}, $live->get_builddir . $live->{prefix}{build}{files});
+ copy_files_to($live, $live->{media}{files}, $live->get_builddir('files'));
}
- remove_files_from($live->{media}{remove_files}, $live->get_builddir . $live->{prefix}{build}{files});
+ remove_files_from($live->{media}{remove_files}, $live->get_builddir('files'));
run_({ targetarch => $live->{settings}{arch} },
"chroot", $live->get_system_root, "bash", "-c", $live->{system}{postInstall}) if $live->{system}{postInstall};
@@ -185,15 +185,14 @@ sub configure_draklive_resize {
my $resizable_loopback = find { $_->{min_size} } @{$live->{mount}{dirs} || []};
if ($resizable_loopback) {
- my $media_loopbacks = $live->get_media_prefix('loopbacks');
my $ext = $loop_types{$resizable_loopback->{type}}{extension};
output($live->get_system_root . '/etc/sysconfig/draklive-resize', <<EOF);
DRAKLIVE_RESIZE=yes
-LOOPBACK=$live->{prefix}{live}{mnt}$live->{prefix}{media}{mnt}${media_loopbacks}$resizable_loopback->{path}$ext
+LOOPBACK=/live/media/loopbacks$resizable_loopback->{path}$ext
TYPE=$resizable_loopback->{fs}
MIN_SIZE=$resizable_loopback->{min_size}
-MOUNT=$live->{prefix}{live}{mnt}$resizable_loopback->{mountpoint}_resized
-OLD_MOUNT=$live->{prefix}{live}{mnt}$resizable_loopback->{mountpoint}
+MOUNT=/live$resizable_loopback->{mountpoint}_resized
+OLD_MOUNT=/live$resizable_loopback->{mountpoint}
UNION=/
EOF
}
@@ -232,7 +231,7 @@ sub clean_system_conf_file {
sub write_dist_lists {
my ($live) = @_;
- my $lists_dir = $live->get_builddir . $live->{prefix}{build}{dist};
+ my $lists_dir = $live->get_builddir('dist');
mkdir_p($lists_dir);
run_("chroot " . $live->get_system_root . " rpm -qa | sort > " .