summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-20 22:37:19 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-20 22:37:19 +0000
commit3936c319c862249d2474ee311481d08d73e5cdce (patch)
tree763ddf426e828a8791424dbc97c0a6155576870b
parent22b5945c265941c89f07bdf543f4c161f776b593 (diff)
downloaddrakx-3936c319c862249d2474ee311481d08d73e5cdce.tar
drakx-3936c319c862249d2474ee311481d08d73e5cdce.tar.gz
drakx-3936c319c862249d2474ee311481d08d73e5cdce.tar.bz2
drakx-3936c319c862249d2474ee311481d08d73e5cdce.tar.xz
drakx-3936c319c862249d2474ee311481d08d73e5cdce.zip
(partition_with_diskdrake): ensure the $::expert flag modifications in
diskdrake do not escape from diskdrake
-rw-r--r--perl-install/install_interactive.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index f24046baa..997177cce 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -32,7 +32,10 @@ sub partition_with_diskdrake {
do {
$ok = 1;
require diskdrake_interactive;
- diskdrake_interactive::main($o, $all_hds, $nowizard);
+ {
+ local $::expert = $::expert;
+ diskdrake_interactive::main($o, $all_hds, $nowizard);
+ }
delete $o->{wizard} and return partitionWizard($o, 'nodiskdrake');
my @fstab = fsedit::get_all_fstab($all_hds);