summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-04-21 13:48:30 +0000
committerOlivier Blin <oblin@mandriva.com>2009-04-21 13:48:30 +0000
commit2437979b3006303a17f7cd153d78e9be0126ce05 (patch)
treed107acbdd4c426bca0210b6c04e537d3dc23f3c6
parent245525de2ed3ea330af6182580d981ad9519d79e (diff)
downloaddrakx-2437979b3006303a17f7cd153d78e9be0126ce05.tar
drakx-2437979b3006303a17f7cd153d78e9be0126ce05.tar.gz
drakx-2437979b3006303a17f7cd153d78e9be0126ce05.tar.bz2
drakx-2437979b3006303a17f7cd153d78e9be0126ce05.tar.xz
drakx-2437979b3006303a17f7cd153d78e9be0126ce05.zip
ensure ntp package is installed when configuring ntp
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/finish-install3
2 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index ff4cd1de3..d81afa16f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -8,6 +8,8 @@
- service_harddrake:
o do not crash if loading new drivers fails
(happened with amd64_agp wrongly listed in pcitable, #43870)
+- finish-install:
+ o ensure ntp package is installed when configuring ntp
Version 12.29 - 21 April 2009
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index 2034ca255..3da4d6973 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -71,7 +71,10 @@ sub ask_timezone() {
$timezone = timezone::read();
$timezone->{timezone} = timezone::bestTimezone($locale->{country}) if $locale->{country};
any::configure_timezone($in, $timezone, 'ask_gmt', lc(get_conf('TIMEZONE')) eq 'simplified');
+
+ $in->do_pkgs->ensure_is_installed('ntp') if $timezone->{ntp};
timezone::write($timezone);
+
#- reload sys clock from hc once we know the real timezone
timezone::reload_sys_clock($timezone);
}