diff options
Diffstat (limited to 'perl-install/install/steps.pm')
| -rw-r--r-- | perl-install/install/steps.pm | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index 54f322632..73ff47918 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -1,4 +1,4 @@ -package install::steps; # $Id: steps.pm 268013 2010-04-29 15:02:04Z pterjan $ +package install::steps; use diagnostics; use strict; @@ -369,9 +369,6 @@ sub beforeInstallPackages { #- some packages need such files for proper installation. install::any::write_fstab($o); - require network::network; - network::network::add2hosts("localhost", "127.0.0.1"); - #- resolv.conf will be modified at boot time #- the following will ensure we have a working DNS during install if (-e "/etc/resolv.conf" && ! -e "$::prefix/etc/resolv.conf") { @@ -463,7 +460,7 @@ Either your cdrom drive or your cdrom is defective. Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\" ") if any { m|read failed: Input/output error| } cat_("$::prefix/root/drakx/install.log"); - if (arch() !~ /^sparc/ && !$o->{justdb}) { #- TODO restore it as may be needed for sparc + if (!$o->{justdb}) { -x "$::prefix/usr/bin/dumpkeys" or $::testing or die "Some important packages did not get installed properly. @@ -496,11 +493,6 @@ Consoles 1,3,4,7 may also contain interesting information"; #- else if eth0 is not existing, glibc segfaults. substInFile { s/\s*wins// if /^\s*hosts\s*:/ } "$::prefix/etc/nsswitch.conf"; - #- make sure some services have been enabled (or a catastrophic restart will occur). - #- these are normally base package post install scripts or important services to start. - run_program::rooted($::prefix, "chkconfig", "--add", $_) foreach - qw(netfs network rawdevices sound kheader keytable syslog crond portmap); - if ($o->{mouse}{device} =~ /ttyS/) { log::l("disabling gpm for serial mice (does not get along nicely with X)"); run_program::rooted($::prefix, "chkconfig", "--del", "gpm"); @@ -697,7 +689,14 @@ sub configureTimezone { my ($o) = @_; install::any::preConfigureTimezone($o); - $o->pkg_install('ntp') if $o->{timezone}{ntp}; + if ($o->{timezone}{ntp}) { + # We prefer chrony, but we'll deal with ntpd for the sake of upgrades + my $pkg = install::pkgs::packageByName($o->{packages}, 'chrony'); + unless ($pkg && $pkg->flag_installed) { + $pkg = install::pkgs::packageByName($o->{packages}, 'ntp'); + $o->pkg_install('chrony') unless ($pkg && $pkg->flag_installed); + } + } require timezone; timezone::write($o->{timezone}); @@ -745,7 +744,7 @@ sub addUser { $autologin->{user} = $o->{autologin}; $autologin->{desktop} = $o->{desktop} if $o->{desktop}; $autologin->{dm} = $o->{dm} if $o->{dm}; - any::set_autologin($o->do_pkgs, $autologin); + any::set_autologin($o->do_pkgs, $autologin, $o->{step}{auto}); } install::any::disable_user_view() if @$users == (); @@ -848,7 +847,7 @@ sub exitInstall { }; output("$::prefix/root/drakx/package_list.pl", install::any::selected_leaves_pl($o)); - eval { install::any::getAndSaveAutoInstallFloppies($o, 1) } if arch() !~ /^ppc/; + eval { install::any::getAndSaveAutoInstallFloppies($o, 1) }; eval { output "$::prefix/root/drakx/README", sprintf("This directory contains several installation-related files, mostly log files (very useful if you ever report a bug!). |