summaryrefslogtreecommitdiffstats
path: root/lib/MGA
diff options
context:
space:
mode:
Diffstat (limited to 'lib/MGA')
-rw-r--r--lib/MGA/DrakISO/Config.pm3
-rw-r--r--lib/MGA/DrakISO/ISOBuild.pm4
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/MGA/DrakISO/Config.pm b/lib/MGA/DrakISO/Config.pm
index 2d7de1f..ce7df67 100644
--- a/lib/MGA/DrakISO/Config.pm
+++ b/lib/MGA/DrakISO/Config.pm
@@ -72,8 +72,7 @@ sub check_config {
sub complete_config {
my ($build) = @_;
- $build->{settings}{builddir} ||= '/var/lib/drakiso/build';
- $build->{settings}{chroot} ||= '/var/lib/drakiso/chroot';
+ $build->{settings}{workdir} ||= '/var/lib/drakiso';
$build->{settings}{arch} ||= chomp_(`rpm --eval '%{_target_cpu}'`);
diff --git a/lib/MGA/DrakISO/ISOBuild.pm b/lib/MGA/DrakISO/ISOBuild.pm
index 2f4bce9..ff4f60a 100644
--- a/lib/MGA/DrakISO/ISOBuild.pm
+++ b/lib/MGA/DrakISO/ISOBuild.pm
@@ -49,12 +49,12 @@ sub get_set_suffix {
sub get_builddir {
my ($build, $o_subdir) = @_;
- $build->{settings}{builddir} . '/' . $build->get_name . $build->get_set_suffix . if_($o_subdir, '/' . $o_subdir);
+ $build->{settings}{workdir} . '/build/' . $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;
+ $build->{settings}{workdir} . '/chroot/' . $build->get_name . $build->get_set_suffix;
}
sub get_absolute_path {