diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install2.pm | 9 | ||||
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 3 | ||||
| -rw-r--r-- | perl-install/modules.pm | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 3bcde1464..deae9004b 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -112,7 +112,7 @@ sub selectMouse { sub setupSCSI { my ($clicked, $_ent_number, $auto) = @_; - if (!$::testing && !$::uml_install) { + if (!$::testing && !$::local_install) { -d '/lib/modules/' . c::kernel_version() || -s modules::cz_file() or die N("Can not 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()); } @@ -294,7 +294,7 @@ sub addUser { #------------------------------------------------------------------------------ sub setupBootloader { my ($_clicked, $ent_number, $auto) = @_; - return if $::uml_install; + return if $::local_install; $o->{modules_conf}->write; @@ -407,7 +407,8 @@ sub main { text => sub { $o->{interactive} = "newt" }, stdio => sub { $o->{interactive} = "stdio" }, kickstart => sub { $::auto_install = $v }, - uml_install => sub { $::uml_install = 1 }, + local_install => sub { $::local_install = 1 }, + uml_install => sub { $::uml_install = $::local_install = 1 }, auto_install => sub { $::auto_install = $v }, simple_themes => sub { $o->{simple_themes} = 1 }, theme => sub { $o->{theme} = $v }, @@ -437,7 +438,7 @@ sub main { unlink $_ foreach "/modules/modules.mar", "/sbin/stage1"; } - log::openLog(($::testing || $o->{localInstall}) && 'debug.log'); + log::openLog($::testing && 'debug.log'); log::l("second stage install running (", install_any::drakx_version(), ")"); eval { output('/proc/sys/kernel/modprobe', "\n") } if !$::testing; #- disable kmod, otherwise we get a different behaviour in kernel vs kernel-BOOT diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 764fae2f8..59f50ccdb 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -33,7 +33,8 @@ sub new($$) { $ENV{DISPLAY} ||= $o->{display} || ":0"; my $wanted_DISPLAY = $::testing && -x '/usr/X11R6/bin/Xnest' ? ':9' : $ENV{DISPLAY}; - if ($ENV{DISPLAY} =~ /^:\d/ && !$::testing || $ENV{DISPLAY} ne $wanted_DISPLAY) { #- is the display local or distant? + if (!$::local_install && + ($::testing ? $ENV{DISPLAY} ne $wanted_DISPLAY : $ENV{DISPLAY} =~ /^:\d/)) { #- is the display local or distant? my $f = "/tmp/Xconf"; if (!$::testing) { devices::make("/dev/kbd"); diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 8f50b78e1..2735d09ea 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -56,7 +56,7 @@ sub cond_mapping_24_26 { # handles dependencies sub load_raw { my ($l, $h_options) = @_; - if ($::testing) { + if ($::testing || $::local_install) { log::l("i would load module $_ ($h_options->{$_})") foreach @$l; } elsif ($::isInstall && !$::move) { load_raw_install($l, $h_options); @@ -287,7 +287,7 @@ sub cz_file() { sub extract_modules { my ($dir, @modules) = @_; my $cz = cz_file(); - if (!-e $cz && !$::uml_install) { + if (!-e $cz && !$::local_install) { unlink $_ foreach glob_("/lib/modules*.cz*"); require install_any; install_any::getAndSaveFile("install/stage2/live$cz", $cz) or die "failed to get modules $cz: $!"; |