summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2010-01-13 15:50:00 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2010-01-13 15:50:00 +0000
commit7046a6f83d5ee849c66aba3daaa01bcd937f7540 (patch)
tree8a73abe18baf774828748b16df8f9a2ddf44936d
parent21333f886353cbaf0ab925d96d08d23ee9712043 (diff)
downloaddraklive-install-7046a6f83d5ee849c66aba3daaa01bcd937f7540.tar
draklive-install-7046a6f83d5ee849c66aba3daaa01bcd937f7540.tar.gz
draklive-install-7046a6f83d5ee849c66aba3daaa01bcd937f7540.tar.bz2
draklive-install-7046a6f83d5ee849c66aba3daaa01bcd937f7540.tar.xz
draklive-install-7046a6f83d5ee849c66aba3daaa01bcd937f7540.zip
fix remove_unused_packages when the tree to install is not /
-rwxr-xr-xdraklive-install8
1 files changed, 6 insertions, 2 deletions
diff --git a/draklive-install b/draklive-install
index 3a7573f..c6870a1 100755
--- a/draklive-install
+++ b/draklive-install
@@ -56,7 +56,6 @@ 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();
@@ -185,8 +184,13 @@ sub ask_partitions {
}
sub remove_unused_packages {
- my ($in) = @_;
+ my ($in, $o_prefix) = @_;
require pkgs;
+ #in remove_unused_packages, we want to get the locale from the currently
+ #running system, but we want to remove unused packages from the
+ #system based in $o_prefix, that's why we use an extra arg instead of
+ #directly using $::prefix
+ local $::prefix;
pkgs::remove_unused_packages($in, $in->do_pkgs, $o_prefix);
}