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 ;)

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 {