diff options
author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-01-09 23:34:24 +0000 |
---|---|---|
committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-01-10 00:38:35 +0000 |
commit | 57060f5254e48a9eead04426803d4f102f2b0a4b (patch) | |
tree | 3dc19e87420be8334dd7411c91fdfd8c8984df5b /lib/MGA/DrakISO/BuildRoot.pm | |
parent | 63555aa270059488b013e6c802cca64a8d6eebdc (diff) | |
download | drakiso-57060f5254e48a9eead04426803d4f102f2b0a4b.tar drakiso-57060f5254e48a9eead04426803d4f102f2b0a4b.tar.gz drakiso-57060f5254e48a9eead04426803d4f102f2b0a4b.tar.bz2 drakiso-57060f5254e48a9eead04426803d4f102f2b0a4b.tar.xz drakiso-57060f5254e48a9eead04426803d4f102f2b0a4b.zip |
Miscellaneous code cleanup.
Diffstat (limited to 'lib/MGA/DrakISO/BuildRoot.pm')
-rw-r--r-- | lib/MGA/DrakISO/BuildRoot.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/MGA/DrakISO/BuildRoot.pm b/lib/MGA/DrakISO/BuildRoot.pm index af06769..187e8a2 100644 --- a/lib/MGA/DrakISO/BuildRoot.pm +++ b/lib/MGA/DrakISO/BuildRoot.pm @@ -66,7 +66,7 @@ sub install_live_system { my $rooted_stage2 = '/tmp/stage2'; my $chroot_stage2 = $chroot . $rooted_stage2; - my $live_root = $build->get_system_root; + my $live_root = $build->get_live_root; if (-e $live_root) { # We want a clean start... umount_all_in_root($live_root); @@ -367,7 +367,7 @@ sub customise_live_system { print "Customising Live system\n" if $::verbose; my $arch = $build->{settings}{arch}; - my $root = $build->get_system_root; + my $root = $build->get_live_root; # Workaround buggy installation of directories that are not owned by any # packages. @@ -530,7 +530,7 @@ sub configure_draklive_resize { "OLD_MOUNT=/live$resizable_loopback->{mountpoint}", "UNION=/", ); - output_to_root($build->get_system_root, '/etc/sysconfig/draklive-resize', undef, @text); + output_to_root($build->get_live_root, '/etc/sysconfig/draklive-resize', undef, @text); } } @@ -543,10 +543,10 @@ sub clean_system_conf_file { sub write_dist_lists { my ($build) = @_; - my $lists_dir = $build->get_builddir('dist'); + my $lists_dir = $build->get_build_dir('dist'); mkdir_p($lists_dir); - my $root = $build->get_system_root; + my $root = $build->get_live_root; run_in_root($root, undef, "rpm -qa | sort > " . $lists_dir . '/' . $build->get_name . '.lst'); |