summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-09-13 08:20:21 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-09-13 08:20:21 +0000
commitb9d99b78e9b9f4dc76eac74971b77f462d2dfd5f (patch)
treee818ca5801e3b6a754b2bcfbb39332bb9356534d
parentf72b19ba53e26a292b43ffc259001e95a8dec35f (diff)
downloaddrakx-b9d99b78e9b9f4dc76eac74971b77f462d2dfd5f.tar
drakx-b9d99b78e9b9f4dc76eac74971b77f462d2dfd5f.tar.gz
drakx-b9d99b78e9b9f4dc76eac74971b77f462d2dfd5f.tar.bz2
drakx-b9d99b78e9b9f4dc76eac74971b77f462d2dfd5f.tar.xz
drakx-b9d99b78e9b9f4dc76eac74971b77f462d2dfd5f.zip
really skip setupBootloader in local_install
-rw-r--r--perl-install/install2.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 7b908a12a..1bb9537ec 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -285,6 +285,7 @@ sub addUser {
#------------------------------------------------------------------------------
sub setupBootloader {
my ($auto) = @_;
+ return if $::local_install;
$o->{modules_conf}->write;
@@ -421,7 +422,7 @@ sub main {
if ($::local_install) {
push @auto,
# 'selectLanguage', 'selectKeyboard', 'miscellaneous', 'selectInstallClass',
- 'doPartitionDisks', 'formatPartitions', 'setupBootloader';
+ 'doPartitionDisks', 'formatPartitions';
fs::mount::usbfs(''); #- do it now so that when_load doesn't do it
}