diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-04-03 15:55:16 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-04-03 15:55:16 +0000 |
| commit | f9f4997bbe48ea8f7aca9884e9cc2f15298fb462 (patch) | |
| tree | 288a123dd61688eb467962601908de4a078c7ea9 | |
| parent | f8f0e4569bb54438ed0f1a5c5aadad8641f7a9f0 (diff) | |
| download | drakx-f9f4997bbe48ea8f7aca9884e9cc2f15298fb462.tar drakx-f9f4997bbe48ea8f7aca9884e9cc2f15298fb462.tar.gz drakx-f9f4997bbe48ea8f7aca9884e9cc2f15298fb462.tar.bz2 drakx-f9f4997bbe48ea8f7aca9884e9cc2f15298fb462.tar.xz drakx-f9f4997bbe48ea8f7aca9884e9cc2f15298fb462.zip | |
write UTC setting in /etc/adjtime (#36522)
see RH #438124 and http://git.fedorahosted.org/git/anaconda.git?p=anaconda.git;a=commitdiff;h=4195005f05b87bbd75c6d9dc5ca034cceecaa4b7
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/timezone.pm | 6 |
3 files changed, 9 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index a962a5b49..e4e410e0c 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,6 +1,7 @@ - service_harddrake: o fix detecting modules installed in new dkms locations (/dkms and /dkms-binary) instead of /kernel +- drakclock: write UTC setting in /etc/adjtime (#36522) Version 10.27 - 3 April 2008 diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 733fdacdc..676cff178 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- time: write UTC setting in /etc/adjtime (#36522) + Version 10.28 - 3 April 2008 - fix computed install size in group selection (#39303) diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm index 5babf2061..b072dda3a 100644 --- a/perl-install/timezone.pm +++ b/perl-install/timezone.pm @@ -64,6 +64,12 @@ sub write { UTC => bool2text($t->{UTC}), ARC => "false", }); + + my $adjtime_file = $::prefix . '/etc/adjtime'; + my @adjtime = cat_($adjtime_file); + @adjtime or @adjtime = ("0.0 0 0.0\n", "0\n"); + $adjtime[2] = $t->{UTC} ? "UTC\n" : "LOCAL\n"; + output_p($adjtime_file, @adjtime); } sub reload_sys_clock { |