diff options
| author | Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com> | 2013-12-21 13:37:33 +0100 |
|---|---|---|
| committer | Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com> | 2013-12-21 13:37:33 +0100 |
| commit | 095c6b25885ce3d22eedba8cdb98f1fd7e8708a5 (patch) | |
| tree | 5bfc768996b3ddec185abeb02b602b48b14d10db /perl-install/install/steps.pm | |
| parent | df60191bdbddfa7c8e5bd11a2578aae6740963c0 (diff) | |
| parent | f76dc0931e47338aa9c7db257d28e5015d8a2f47 (diff) | |
| download | drakx-095c6b25885ce3d22eedba8cdb98f1fd7e8708a5.tar drakx-095c6b25885ce3d22eedba8cdb98f1fd7e8708a5.tar.gz drakx-095c6b25885ce3d22eedba8cdb98f1fd7e8708a5.tar.bz2 drakx-095c6b25885ce3d22eedba8cdb98f1fd7e8708a5.tar.xz drakx-095c6b25885ce3d22eedba8cdb98f1fd7e8708a5.zip | |
Merge branch 'master' of git://git.mageia.org/software/drakx
Diffstat (limited to 'perl-install/install/steps.pm')
| -rw-r--r-- | perl-install/install/steps.pm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index 58236da2e..f51d50729 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -689,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}); |