Browse code
Setting hwclock after customization, PR # 1684889
Change-Id: I729c29ec478ca9e0e4e43e9bf2cda8adfda443c7
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2497
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Kumar Kaushik authored on 2017/04/21 16:24:34Showing 2 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Usermode tools for VmWare virts |
| 2 | 2 |
Name: open-vm-tools |
| 3 | 3 |
Version: 10.1.5 |
| 4 |
-Release: 3%{?dist}
|
|
| 4 |
+Release: 4%{?dist}
|
|
| 5 | 5 |
License: LGPLv2+ |
| 6 | 6 |
URL: https://github.com/vmware/open-vm-tools |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -19,6 +19,7 @@ Patch2: hostnameReCustomizationFix.patch |
| 19 | 19 |
Patch3: PureIPv6-hosts.patch |
| 20 | 20 |
Patch4: open-vm-tools-sysmacros.patch |
| 21 | 21 |
Patch5: GOSC-libDeploy.patch |
| 22 |
+Patch6: timezoneCust.patch |
|
| 22 | 23 |
BuildRequires: glib-devel |
| 23 | 24 |
BuildRequires: xerces-c-devel |
| 24 | 25 |
BuildRequires: xml-security-c-devel |
| ... | ... |
@@ -48,6 +49,7 @@ VmWare virtualization user mode tools |
| 48 | 48 |
%patch3 -p0 |
| 49 | 49 |
%patch4 -p1 |
| 50 | 50 |
%patch5 -p1 |
| 51 |
+%patch6 -p0 |
|
| 51 | 52 |
%build |
| 52 | 53 |
touch ChangeLog |
| 53 | 54 |
autoreconf -i |
| ... | ... |
@@ -105,6 +107,8 @@ fi |
| 105 | 105 |
|
| 106 | 106 |
|
| 107 | 107 |
%changelog |
| 108 |
+* Thu Apr 20 2017 Kumar Kaushik <kaushikk@vmware.com> 10.1.5-4 |
|
| 109 |
+- Timezone customization, PR # 1684889 |
|
| 108 | 110 |
* Fri Apr 07 2017 Kumar Kaushik <kaushikk@vmware.com> 10.1.5-3 |
| 109 | 111 |
- Applying tmp race condition patch, PR #1733669 |
| 110 | 112 |
* Fri Mar 24 2017 Alexey Makhalov <amakhalov@vmware.com> 10.1.5-2 |
| 111 | 113 |
new file mode 100755 |
| ... | ... |
@@ -0,0 +1,14 @@ |
| 0 |
+diff -ru gosc-scripts/imc-shell/imgcust-scripts/PhotonCustomization.sh gosc-scripts-modify/imc-shell/imgcust-scripts/PhotonCustomization.sh |
|
| 1 |
+--- gosc-scripts/imc-shell/imgcust-scripts/PhotonCustomization.sh 2016-04-29 14:10:39.000000000 -0700 |
|
| 2 |
+@@ -31,8 +31,10 @@ |
|
| 3 |
+ Debug "Not changing UTC" |
|
| 4 |
+ elif [[ $utc == 1 ]]; then |
|
| 5 |
+ Exec '/usr/bin/timedatectl set-local-rtc 0' '' '' |
|
| 6 |
++ Exec '/usr/sbin/hwclock --systohc' '' '' |
|
| 7 |
+ else |
|
| 8 |
+ Exec '/usr/bin/timedatectl set-local-rtc 1' '' '' |
|
| 9 |
++ Exec '/usr/sbin/hwclock --systohc' '' '' |
|
| 10 |
+ fi |
|
| 11 |
+ |
|
| 12 |
+ local tz=$(ConfigFile_GetTimeZone) |