@@ -1,34 +1,24 @@

 #!/bin/bash

-

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

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

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

-

 cd /

 echo "127.0.0.1 localhost" >> /etc/hosts

-# Set UTC timezone

-# ln -sf /usr/share/zoneinfo/UTC /etc/localtime

-

 # Update /etc/resolv.conf

-

 rm /etc/resolv.conf

-

 echo "nameserver 172.31.0.2" >> /etc/resolv.conf

 echo "search ec2.internal" >> /etc/resolv.conf

 # Remove ssh host keys and add script to regenerate them at boot time.

-

-rm /etc/ssh/ssh_host_*

+rm -f /etc/ssh/ssh_host_*

 sudo groupadd docker

 sudo groupadd sudo

-

 rm /root/.ssh/authorized_keys   

 # ssh server config

@@ -5,15 +5,12 @@ cd /lib/systemd/system/multi-user.target.wants/

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

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

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

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

 ln -s ../sshd-keygen.service sshd-keygen.service

-

-

 # Remove ssh host keys and add script to regenerate them at boot time.

-rm /etc/ssh/ssh_host_*

+rm -f /etc/ssh/ssh_host_*

 sudo groupadd docker

 sudo groupadd sudo

@@ -54,7 +51,6 @@ echo "ServerAliveInterval 180" >> /etc/ssh/ssh_config

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

-

 # Disable loading/unloading of modules

 echo 1 > /proc/sys/kernel/modules_disabled

@@ -72,6 +72,8 @@ echo "ROOT_PARTITION=/dev/mapper/${DEVICE_NAME}p2"

 rm -rf $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}

 mkdir $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}

+UUID_VALUE=$(blkid -s UUID -o value /dev/mapper/${DEVICE_NAME}p2)

+

 mkdir -p $ISO_MOUNT_FOLDER

 mount -o loop $PHOTON_ISO_PATH $ISO_MOUNT_FOLDER

 mount -v -t ext4 /dev/mapper/${DEVICE_NAME}p2 $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}

@@ -84,8 +86,7 @@ rm -f $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/shadow-

 rm -f $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/machine-id

 touch $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/machine-id

 rm -f $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/fstab

-echo "/dev/sda2    /    ext4    defaults,barrier,noatime,noacl,data=ordered 1 1" >> $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/fstab

-

+echo "UUID=$UUID_VALUE    /    ext4    defaults,barrier,noatime,noacl,data=ordered 1 1" >> $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/fstab

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

 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

@@ -105,21 +106,15 @@ if [ $IMG_NAME != "ova" ] && [ $IMG_NAME != "ova_uefi" ] && [ $IMG_NAME != "ova_

     if [ $IMG_NAME = "gce" ]

       then

         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/

     fi

     if [ $IMG_NAME != "ova_generic" ]

       then

-        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 -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 ]

           then

             cp -f $IMG_NAME/cloud-photon.cfg $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/cloud/cloud.cfg

         fi

-    

         cp $IMG_NAME/$IMG_NAME-patch.sh $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/

-

-

         cp /etc/resolv.conf $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/

         echo "chrooting and running patch inside the chroot"

         chroot $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME} /bin/bash -c "/$IMG_NAME-patch.sh"

deleted file mode 100644

@@ -1,17 +0,0 @@

-[Unit]

-Description=Docker Daemon

-After=docker.socket  network.target

-Requires=docker.socket

-

-[Service]

-ExecStart=/bin/docker -d -s overlay -H fd://

-ExecReload=/bin/kill -HUP $MAINPID

-KillMode=process

-Restart=always

-MountFlags=slave

-LimitNOFILE=1048576

-LimitNPROC=1048576

-LimitCORE=infinity

-

-[Install]

-WantedBy=multi-user.target

\ No newline at end of file

deleted file mode 100644

@@ -1,12 +0,0 @@

-[Unit]

-Description=Docker Socket for the API

-PartOf=docker.service

-

-[Socket]

-SocketMode=0660

-SocketUser=root

-SocketGroup=docker

-ListenStream=/var/run/docker.sock

-

-[Install]

-WantedBy=sockets.target

\ No newline at end of file

@@ -32,7 +32,7 @@ echo "nameserver 8.8.8.8" >> /etc/resolv.conf

 # Remove ssh host keys and add script to regenerate them at boot time.

-rm /etc/ssh/ssh_host_*

+rm -f /etc/ssh/ssh_host_*

 printf "GOOGLE\n" > /etc/ssh/sshd_not_to_be_run