summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-14 14:52:13 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-14 14:52:13 +0000
commit2e0df04bf4539c0de15a45305f4868a5b62d6055 (patch)
tree965098e577730b513b53c7014750009fe52400bc
parent0aa7a9e98c3b51085c87aa13d61eef8e3f694626 (diff)
downloaddrakx-backup-do-not-use-2e0df04bf4539c0de15a45305f4868a5b62d6055.tar
drakx-backup-do-not-use-2e0df04bf4539c0de15a45305f4868a5b62d6055.tar.gz
drakx-backup-do-not-use-2e0df04bf4539c0de15a45305f4868a5b62d6055.tar.bz2
drakx-backup-do-not-use-2e0df04bf4539c0de15a45305f4868a5b62d6055.tar.xz
drakx-backup-do-not-use-2e0df04bf4539c0de15a45305f4868a5b62d6055.zip
no_comment
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/install_steps_interactive.pm2
-rw-r--r--perl-install/modparm.pm5
-rw-r--r--perl-install/share/list1
4 files changed, 3 insertions, 7 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index e5528c8ab..d718467fc 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -585,7 +585,7 @@ sub main {
modules::load_deps("/modules/modules.dep");
$o->{modules} = modules::get_stage1_conf($o->{modules}, "/tmp/conf.modules");
modules::read_already_loaded();
- modparm::read_modparm_file("/usr/share/modparm.lst");
+ modparm::read_modparm_file(($::testing ? "/tmp" : "/usr/share") . "/modparm.lst");
if ($o->{method} && $o->{method} eq "ftp") {
require 'ftp.pm';
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 919257d51..d44fcb69b 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -100,7 +100,7 @@ sub choosePartitionsToFormat($$) {
install_steps::choosePartitionsToFormat($o, $fstab);
- my @l = grep { $_->{mntpoint} && isExt2($_) || isSwap($_) } @$fstab;
+ my @l = grep { $_->{mntpoint} && isExt2($_) || isSwap($_) && !$::beginner } @$fstab;
my @r = $o->ask_many_from_list_ref('', _("Choose the partitions you want to format"),
[ map { $_->{mntpoint} || type2name($_->{type}) . " ($_->{device})" } @l ],
[ map { \$_->{toFormat} } @l ]);
diff --git a/perl-install/modparm.pm b/perl-install/modparm.pm
index 438b79dcd..9cce087c0 100644
--- a/perl-install/modparm.pm
+++ b/perl-install/modparm.pm
@@ -59,7 +59,4 @@ sub get_options_name($) {
@names;
}
-#-######################################################################################
-#- Wonderful perl :(
-#-######################################################################################
-1; #
+1;
diff --git a/perl-install/share/list b/perl-install/share/list
index 0ccc7cd16..a163f61c6 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -63,7 +63,6 @@
/usr/lib/perl5/site_perl/5.005/i386-linux/auto/Gtk/Gtk.so
/usr/lib/rpm/rpmrc
/usr/X11R6/bin/XF86_FBDev
-/usr/X11R6/bin/XF86_SVGA
/usr/X11R6/bin/XF86_VGA16
/usr/X11R6/bin/xmodmap
/usr/X11R6/lib/X11/fonts/75dpi/fonts.dir