Browse code
Fixes for GCE image
Anish Swaminathan authored on 2015/08/12 03:58:02Showing 5 changed files
- SPECS/google-daemon/google-daemon.spec
- SPECS/google-startup-scripts/google-startup-scripts.spec
- common/data/packages_gce.json
- support/cloud-image-builder/gce/gce-patch.sh
- support/cloud-image-builder/gce/mk-gce-image.sh
| ... | ... |
@@ -1,12 +1,12 @@ |
| 1 | 1 |
Summary: Google Daemon |
| 2 | 2 |
Name: google-daemon |
| 3 |
-Version: 1.2.2 |
|
| 3 |
+Version: 1.2.7 |
|
| 4 | 4 |
Release: 1%{?dist}
|
| 5 | 5 |
License: Apache License |
| 6 | 6 |
Group: System Environment/Base |
| 7 | 7 |
URL: https://github.com/GoogleCloudPlatform/compute-image-packages/ |
| 8 | 8 |
Source0: google-daemon-%{version}.tar.gz
|
| 9 |
-%define sha1 google-daemon=4cb51288268b09f4a5d07f43d83ca34e5b714383 |
|
| 9 |
+%define sha1 google-daemon=a38bce5383c71f7ecc41c50575fcf29ae4c55489 |
|
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| 12 | 12 |
Provides: google-daemon |
| ... | ... |
@@ -38,3 +38,7 @@ rm -rf $RPM_BUILD_ROOT |
| 38 | 38 |
/usr/* |
| 39 | 39 |
%exclude /README.md |
| 40 | 40 |
%exclude /LICENSE |
| 41 |
+ |
|
| 42 |
+%changelog |
|
| 43 |
+* Mon Aug 10 2015 Anish Swaminathan <anishs@vmware.com> 1.2.7-1 |
|
| 44 |
+- Updated version. |
| ... | ... |
@@ -1,12 +1,12 @@ |
| 1 | 1 |
Summary: Google Startup Scripts |
| 2 | 2 |
Name: google-startup-scripts |
| 3 |
-Version: 1.2.2 |
|
| 3 |
+Version: 1.2.7 |
|
| 4 | 4 |
Release: 1%{?dist}
|
| 5 | 5 |
License: Apache License |
| 6 | 6 |
Group: System Environment/Base |
| 7 | 7 |
URL: https://github.com/GoogleCloudPlatform/compute-image-packages/ |
| 8 | 8 |
Source0: google-startup-scripts-%{version}.tar.gz
|
| 9 |
-%define sha1 google-startup-scripts=2303d183a8e16f36b6ee5b5f0b8fc5e065bd0402 |
|
| 9 |
+%define sha1 google-startup-scripts=23511515ad691ab29d3953b948ee3afb8adcb18d |
|
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| 12 | 12 |
Provides: google-startup-scripts |
| ... | ... |
@@ -40,3 +40,7 @@ rm -rf $RPM_BUILD_ROOT |
| 40 | 40 |
/etc/* |
| 41 | 41 |
%exclude /README.md |
| 42 | 42 |
%exclude /LICENSE |
| 43 |
+ |
|
| 44 |
+%changelog |
|
| 45 |
+* Mon Aug 10 2015 Anish Swaminathan <anishs@vmware.com> 1.2.7-1 |
|
| 46 |
+- Updated version. |
| ... | ... |
@@ -25,7 +25,7 @@ echo "server 169.254.169.254" >> /etc/ntp.conf |
| 25 | 25 |
|
| 26 | 26 |
|
| 27 | 27 |
# Set UTC timezone |
| 28 |
-# ln -sf /usr/share/zoneinfo/UTC /etc/localtime |
|
| 28 |
+ln -sf /usr/share/zoneinfo/UTC /etc/localtime |
|
| 29 | 29 |
|
| 30 | 30 |
# Update /etc/resolv.conf |
| 31 | 31 |
|
| ... | ... |
@@ -107,4 +107,7 @@ if [ $? == 1 ]; then |
| 107 | 107 |
fi |
| 108 | 108 |
|
| 109 | 109 |
docker run --rm -it google/cloud-sdk gsutil $* |
| 110 |
-EOF |
|
| 111 | 110 |
\ No newline at end of file |
| 111 |
+EOF |
|
| 112 |
+ |
|
| 113 |
+chmod a+x /usr/bin/gcloud |
|
| 114 |
+chmod a+x /usr/bin/gsutil |
| ... | ... |
@@ -4,5 +4,7 @@ PHOTON_IMG_OUTPUT_PATH=$1 |
| 4 | 4 |
RAWFILE="photon-gce.raw" |
| 5 | 5 |
TARFILE="photon-gce.tar.gz" |
| 6 | 6 |
|
| 7 |
-echo "Creating ${TARFILE} file from ${RAWFILE}.raw."
|
|
| 8 |
-tar -Szcf $PHOTON_IMG_OUTPUT_PATH/${TARFILE} $PHOTON_IMG_OUTPUT_PATH/${RAWFILE}
|
|
| 7 |
+echo "Creating ${TARFILE} file from ${RAWFILE}."
|
|
| 8 |
+cd $PHOTON_IMG_OUTPUT_PATH |
|
| 9 |
+mv ${RAWFILE} disk.raw
|
|
| 10 |
+tar -Szcf $PHOTON_IMG_OUTPUT_PATH/${TARFILE} disk.raw
|