@@ -39,13 +39,15 @@ rm /etc/ssh/sshd_config

 echo "AuthorizedKeysFile .ssh/authorized_keys" >> /etc/ssh/sshd_config

 echo "UsePrivilegeSeparation sandbox" >> /etc/ssh/sshd_config

-echo "PasswordAuthentication yes" >> /etc/ssh/sshd_config

-echo "PermitRootLogin yes" >> /etc/ssh/sshd_config

+echo "PubkeyAuthentication yes" >> /etc/ssh/sshd_config

+echo "PasswordAuthentication no" >> /etc/ssh/sshd_config

+echo "PermitRootLogin without-password" >> /etc/ssh/sshd_config

 echo "PermitTunnel no" >> /etc/ssh/sshd_config

 echo "AllowTcpForwarding yes" >> /etc/ssh/sshd_config

 echo "X11Forwarding no" >> /etc/ssh/sshd_config

 echo "ClientAliveInterval 420" >> /etc/ssh/sshd_config

-#echo "ChallengeResponseAuthentication no" >> /etc/ssh/sshd_config

+echo "UseDNS no" >> /etc/ssh/sshd_config

+echo "ChallengeResponseAuthentication no" >> /etc/ssh/sshd_config

 echo "UsePAM yes" >> /etc/ssh/sshd_config

@@ -65,7 +67,7 @@ echo "Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,

 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

new file mode 100644

@@ -0,0 +1,92 @@

+# The top level settings are used as module

+# and system configuration.

+

+# A set of users which may be applied and/or used by various modules

+# when a 'default' entry is found it will reference the 'default_user'

+# from the distro configuration specified below

+users:

+   - name: root

+     lock-passwd: true

+

+# If this is set, 'root' will not be able to ssh in and they 

+# will get a message to login instead as the above $user (ubuntu)

+disable_root: false

+

+# This will cause the set+update hostname module to not operate (if true)

+preserve_hostname: false

+

+# datasources to check for cloud-config

+datasource_list: [ 

+                  Ec2

+                 ]

+

+# Example datasource config

+datasource: 

+   Ec2: 

+     metadata_urls: [ 'http://169.254.169.254' ]

+#      timeout: 5 # (defaults to 50 seconds)

+#      max_wait: 10 # (defaults to 120 seconds)

+

+# The modules that run in the 'init' stage

+cloud_init_modules:

+# - migrator

+# - seed_random

+ - bootcmd

+ - write-files

+# - growpart

+# - resizefs

+ - set_hostname

+ - update_hostname

+# - update_etc_hosts

+# - ca-certs

+# - rsyslog

+ - users-groups

+ - ssh

+

+# The modules that run in the 'config' stage

+cloud_config_modules:

+# Emit the cloud config ready event

+# this can be used by upstart jobs for 'start on cloud-config'.

+# - emit_upstart

+# - disk_setup

+# - mounts

+ - ssh-import-id

+# - set-passwords

+ - package-update-upgrade-install

+# - landscape

+# - timezone

+# - puppet

+# - chef

+# - salt-minion

+# - mcollective

+# - disable-ec2-metadata

+ - runcmd

+# - byobu

+ - yum-add-repo

+

+# The modules that run in the 'final' stage

+cloud_final_modules:

+# - rightscale_userdata

+ - scripts-vendor

+ - scripts-per-once

+ - scripts-per-boot

+ - scripts-per-instance

+ - scripts-user

+ - ssh-authkey-fingerprints

+# - keys-to-console

+# - phone-home

+ - final-message

+# - power-state-change

+

+# System and/or distro specific settings

+# (not accessible to handlers/transforms)

+system_info:

+   # This will affect which distro class gets used

+   distro: photon

+   # Other config here will be given to the distro class and/or path classes

+   paths:

+      cloud_dir: /var/lib/cloud/

+      templates_dir: /etc/cloud/templates/

+      upstart_dir: /etc/init/

+

+   ssh_svcname: ssh

@@ -97,6 +97,7 @@ if [ $IMG_NAME != "ova" ]

     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/

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

     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/