diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-12-22 22:02:04 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-12-22 22:02:04 +0000 |
| commit | 9755f9276dc237907104b91198de99d625e3c607 (patch) | |
| tree | cbaac7d335ba412601293a339bf6cc40c666d499 /lib | |
| parent | 55c2e86d0fa97b4182bba4a43eecc076f7cce3ff (diff) | |
| download | drakiso-9755f9276dc237907104b91198de99d625e3c607.tar drakiso-9755f9276dc237907104b91198de99d625e3c607.tar.gz drakiso-9755f9276dc237907104b91198de99d625e3c607.tar.bz2 drakiso-9755f9276dc237907104b91198de99d625e3c607.tar.xz drakiso-9755f9276dc237907104b91198de99d625e3c607.zip | |
Use a single working directory specified by the user.
By adding the 'chroot' and 'build' subdirectory names ourself, we
can make the clean operation a bit safer.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/MGA/DrakISO/Config.pm | 3 | ||||
| -rw-r--r-- | lib/MGA/DrakISO/ISOBuild.pm | 4 |
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 { |