summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-11-05 20:32:18 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-11-05 20:32:18 +0000
commit658fbd0e6c6857894272921b0ff72378fd8a3454 (patch)
treee97ad53c9c35472214044c2e3c9e2b6a78c73cf8
parent443b7c91c9bd5716a626afcc834bec1ad10c8c71 (diff)
downloaddrakx-backup-do-not-use-658fbd0e6c6857894272921b0ff72378fd8a3454.tar
drakx-backup-do-not-use-658fbd0e6c6857894272921b0ff72378fd8a3454.tar.gz
drakx-backup-do-not-use-658fbd0e6c6857894272921b0ff72378fd8a3454.tar.bz2
drakx-backup-do-not-use-658fbd0e6c6857894272921b0ff72378fd8a3454.tar.xz
drakx-backup-do-not-use-658fbd0e6c6857894272921b0ff72378fd8a3454.zip
basic uml_install support (thanks to Brian Murrell)
-rw-r--r--perl-install/install2.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 46dd6efca..5e1c1d280 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -107,7 +107,7 @@ sub selectMouse {
sub setupSCSI {
my ($clicked, $ent_number, $auto) = @_;
- if (!$::live && !$::g_auto_install && !$o->{blank} && !$::testing) {
+ if (!$::live && !$::g_auto_install && !$o->{blank} && !$::testing && !$::uml_install) {
-s modules::cz_file() or die _("Can't access kernel modules corresponding to your kernel (file %s is missing), this generally means your boot floppy in not in sync with the Installation medium (please create a newer boot floppy)", modules::cz_file());
}
@@ -283,7 +283,7 @@ sub createBootdisk {
#------------------------------------------------------------------------------
sub setupBootloader {
my ($clicked, $ent_number, $auto) = @_;
- return if $::g_auto_install;
+ return if $::g_auto_install || $::uml_install;
modules::write_conf($o->{prefix});
@@ -399,6 +399,7 @@ sub main {
stdio => sub { $o->{interactive} = "stdio"},
corporate => sub { $::corporate = 1 },
kickstart => sub { $::auto_install = $v },
+ uml_install => sub { $::uml_install = 1 },
auto_install => sub { $::auto_install = $v },
simple_themes => sub { $o->{simple_themes} = 1 },
useless_thing_accepted => sub { $o->{useless_thing_accepted} = 1 },