summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-04 09:45:24 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-04 09:45:24 +0000
commitbfd3b231137765f76e7b58ab43336421a3d68b78 (patch)
tree7e95544f5e825edb08baa27c875c1975fb020c92
parent34a5611142bb68b14b0c3c739ffc128db039c606 (diff)
downloaddrakx-bfd3b231137765f76e7b58ab43336421a3d68b78.tar
drakx-bfd3b231137765f76e7b58ab43336421a3d68b78.tar.gz
drakx-bfd3b231137765f76e7b58ab43336421a3d68b78.tar.bz2
drakx-bfd3b231137765f76e7b58ab43336421a3d68b78.tar.xz
drakx-bfd3b231137765f76e7b58ab43336421a3d68b78.zip
- set $::isInstall soon enough for fs::type data-structure creation:
fixes reiser4 appearing in diskdrake during install (#36999)
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/install2.pm3
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 5d11446fa..23f3f64e3 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- set $::isInstall soon enough for fs::type data-structure creation:
+ fixes reiser4 appearing in diskdrake during install (#36999)
- add grub entries to allow booting other installed distros
(using grub "configfile") (see #16604)
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 6b5d3452d..871dadfbb 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -4,6 +4,8 @@ use diagnostics;
use strict;
use vars qw($o);
+BEGIN { $::isInstall = 1 }
+
#-######################################################################################
#- misc imports
#-######################################################################################
@@ -312,7 +314,6 @@ sub main {
delete $ENV{TERMINFO};
umask 022;
- $::isInstall = 1;
$::isWizard = 1;
$::no_ugtk_init = 1;