summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2009-11-30 14:44:47 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2009-11-30 14:44:47 +0000
commit121ecedc0694a666b2ad143bc2b9157303ab6d1e (patch)
treeecd010de08cbff2be930af32605e838375ebe8e9
parent39ea89d1ab7b946ac108f587125df84716e29b42 (diff)
downloaddraklive-install-121ecedc0694a666b2ad143bc2b9157303ab6d1e.tar
draklive-install-121ecedc0694a666b2ad143bc2b9157303ab6d1e.tar.gz
draklive-install-121ecedc0694a666b2ad143bc2b9157303ab6d1e.tar.bz2
draklive-install-121ecedc0694a666b2ad143bc2b9157303ab6d1e.tar.xz
draklive-install-121ecedc0694a666b2ad143bc2b9157303ab6d1e.zip
make sure to remove packages from the source copy dir
draklive-install will not use the system found in / when installing files but it might use another directory as a source. Take that into account when removing unused packages, otherwise we'll end up with a cleaned up / but with a not-cleaned up installation which is not what we want ;)
-rw-r--r--NEWS3
-rwxr-xr-xdraklive-install6
2 files changed, 6 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 7c7244a..e2f6373 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- when not installing from /, make sure to remove the unused files from the
+ source directory
+
1.23:
- update advertisement screen
diff --git a/draklive-install b/draklive-install
index 8d66403..3a7573f 100755
--- a/draklive-install
+++ b/draklive-install
@@ -56,12 +56,13 @@ sub install_live() {
my %settings = getVarsFromSh($system_file);
my $copy_source = $settings{SOURCE} || '/';
+ local $::prefix = $copy_source;
my $live_media = '/live/media';
display_start_message();
init_hds($in, $all_hds, $fstab, $live_media);
ask_partitions_loop($in, $all_hds, $fstab, $copy_source);
- remove_unused_packages($in);
+ remove_unused_packages($in, $copy_source);
prepare_root($in, $all_hds);
copy_root($in, $copy_source);
complete_install($in, $all_hds);
@@ -185,9 +186,8 @@ sub ask_partitions {
sub remove_unused_packages {
my ($in) = @_;
- local $::prefix;
require pkgs;
- pkgs::remove_unused_packages($in, $in->do_pkgs);
+ pkgs::remove_unused_packages($in, $in->do_pkgs, $o_prefix);
}
sub prepare_root {