open-vm-tools: Revert regex changes to gosc scripts
Commit 2a0492e128be (Fix gosc scripts to account for multiple network
files) made regex changes to gosc scripts to deal with multiple
network files under /etc/systemd/network/ for the same network
interface. However, the underlying problem that prompted that fix was
actually a user error that left an uintended additional network file
lying around for the same network interface (i.e., 20-eth0.network, in
addition to 10-eth0.network.manual). This regex change also broke an
assumption that VCHA happens to rely on (i.e., the .manual extension
for eth0 interface should be preserved by guest customization
scripts). So revert that commit to make sure that VCHA works again.
[ Also, given how VCHA expects files under /etc/systemd/network/ to
look like, there is no clear fix from the guest-customization code for
such a scenario, except to remove that extraneous file. ]
Change-Id: Id759b0fd305d6a83a7f4db7f79b4bed2fb05ca18
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4981
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Srivatsa S. Bhat authored on 2018/04/09 17:32:57Showing 1 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Usermode tools for VmWare virts |
| 2 | 2 |
Name: open-vm-tools |
| 3 | 3 |
Version: 10.2.0 |
| 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 |
| ... | ... |
@@ -9,8 +9,8 @@ Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
Source0: https://github.com/vmware/open-vm-tools/archive/%{name}-stable-%{version}.tar.gz
|
| 11 | 11 |
%define sha1 open-vm-tools=adba97493c4f96db6281a6964ee26b17b5adc5c5 |
| 12 |
-Source1: gosc-scripts-1.1.tar.gz |
|
| 13 |
-%define sha1 gosc-scripts-1.1=655ed8832165a60eb2493b8cecf1b26d0c979d2a |
|
| 12 |
+Source1: gosc-scripts-1.2.tar.gz |
|
| 13 |
+%define sha1 gosc-scripts-1.2=5031dd9b3b0569a40d2ee0caaa55a1cbf782345e |
|
| 14 | 14 |
Source2: vmtoolsd.service |
| 15 | 15 |
Source3: vgauthd.service |
| 16 | 16 |
Patch0: GOSC-libDeploy.patch |
| ... | ... |
@@ -98,6 +98,8 @@ fi |
| 98 | 98 |
|
| 99 | 99 |
|
| 100 | 100 |
%changelog |
| 101 |
+* Mon Apr 09 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 10.2.0-4 |
|
| 102 |
+- Revert regex changes to gosc scripts. |
|
| 101 | 103 |
* Wed Mar 14 2018 Anish Swaminathan <anishs@vmware.com> 10.2.0-3 |
| 102 | 104 |
- Fix gosc patch to call customization |
| 103 | 105 |
* Wed Mar 14 2018 Anish Swaminathan <anishs@vmware.com> 10.2.0-2 |