@@ -1,3 +1,3 @@

 {

-    "packages":["sudo", "tar", "ntp"]

+    "packages":["sudo", "tar"]

 }

@@ -1,3 +1,3 @@

 {

-    "packages":["sudo", "python-pyasn1", "WALinuxAgent", "ntp"]

+    "packages":["sudo", "python-pyasn1", "WALinuxAgent"]

 }

@@ -1,3 +1,3 @@

 {

-    "packages":["sudo", "tar", "which", "google-daemon", "google-startup-scripts", "kubernetes", "ntp"]

+    "packages":["sudo", "tar", "which", "google-daemon", "google-startup-scripts", "kubernetes", "perl", "ntp"]

 }

@@ -3,8 +3,6 @@

 cd /lib/systemd/system/multi-user.target.wants/

-ln -s ../ntpd.service ntpd.service

-# ln -s ../etcd.service etcd.service

 ln -s ../docker.service docker.service

 ln -s ../eth0.service eth0.service

@@ -68,8 +66,6 @@ echo "Tunnel no" >> /etc/ssh/ssh_config

 echo "ServerAliveInterval 420" >> /etc/ssh/ssh_config

 sed -i '/.*linux.*vmlinuz/ s/$/ console=ttyS0/' /boot/grub/grub.cfg

-# Disable root login

-#usermod -L root

 # Disable loading/unloading of modules

 echo 1 > /proc/sys/kernel/modules_disabled

@@ -5,8 +5,6 @@ cd /lib/systemd/system/multi-user.target.wants/

 # Create links in multi-user.target to auto-start these scripts and services.

-ln -s ../ntpd.service ntpd.service

-# ln -s ../etcd.service etcd.service

 ln -s ../docker.service docker.service

 ln -s ../eth0.service eth0.service

 ln -s ../waagent.service waagent.service

@@ -57,8 +55,6 @@ echo "ServerAliveInterval 180" >> /etc/ssh/ssh_config

 sed -i '/.*linux.*vmlinuz/ s/$/ console=ttyS0 earlyprintk=ttyS0 rootdelay=30/' /boot/grub/grub.cfg

-# Disable root login

-#usermod -L root

 # Disable loading/unloading of modules

 echo 1 > /proc/sys/kernel/modules_disabled

@@ -89,10 +89,12 @@ if [ $IMG_NAME != "ova" ]

     mount -o bind /dev $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/dev

     mount -o bind /dev/pts $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/dev/pts

     mount -o bind /sys $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/sys

-

+    if [ $IMG_NAME = "gce" ]

+      then

+        cp ntpd.service $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/lib/systemd/system/

+    fi

     cp ntpd.service $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/lib/systemd/system/

     cp eth0.service $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/lib/systemd/system/

-    #cp etcd.service $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/lib/systemd/system/

     cp -f docker.service $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/lib/systemd/system/

     cp -f docker.socket $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/lib/systemd/system/

     if [ -e $IMG_NAME/cloud-photon.cfg ]

@@ -1,9 +1,6 @@

 #!/bin/bash

 set -x

-cp -f /usr/lib/systemd/system/google* /lib/systemd/system/

-cp -f /usr/lib/systemd/system/kub* /lib/systemd/system/

-

 cd /lib/systemd/system/multi-user.target.wants/

 # Create links in multi-user.target to auto-start these scripts and services.

@@ -11,7 +8,6 @@ for i in ../google*; do  ln -s $i `basename $i`; done

 # for i in ../kube*; do  ln -s $i `basename $i`; done

 ln -s ../ntpd.service ntpd.service

-# ln -s ../etcd.service etcd.service

 ln -s ../docker.service docker.service

 ln -s ../eth0.service eth0.service

@@ -5,7 +5,7 @@ After=network.target nss-lookup.target

 [Service]

 Type=forking

 PrivateTmp=true

-ExecStart=/usr/sbin/ntpd -g -u ntp:ntp

+ExecStart=/usr/bin/ntpd -g -u ntp:ntp

 Restart=always

 [Install]