abc

ucloud-init.start

@@ -15,6 +15,11 @@ ssh_authorized_keys_path='/root/.ssh/authorized_keys'
 ssh_config_path='/etc/ssh/ssh_config'
 sshd_config_path='/etc/ssh/sshd_config'
 
+# Show output of this script
+if [[ ! -e /etc/conf.d/local ]] && ! grep -q "rc_verbose=yes" /etc/conf.d/local; then
+	echo "rc_verbose=yes" >> /etc/conf.d/local
+fi
+
 # Check if rdnssd is installed, if not put ungleich DNS
 # into /etc/resolv.conf and install rdnssd for the next time
 if ! $(which rdnssd); then
@@ -38,26 +43,31 @@ if [[ $(get_distro) = "alpine" ]]; then
 		echo "PasswordAuthentication no" >> $ssh_config_path
 	fi
 	
-	if ! grep -q "PermitRootLogin yes" $sshd_config_path; then
-		echo "PermitRootLogin yes" >> $sshd_config_path
+	if ! grep -q "PermitRootLogin prohibit-password" $sshd_config_path; then
+		echo "PermitRootLogin prohibit-password" >> $sshd_config_path
 	fi
 	service sshd restart
 else
 	echo "Unsupported OS"
-	exit
+	exit 1
 fi
 
+# TODO: Try to replace the growpart to parted
+
 wget https://git.launchpad.net/ubuntu/+source/cloud-utils/plain/bin/growpart
 if [ -e growpart ]; then
 	sh ./growpart /dev/vda3; rm growpart
 fi
 
+
 # TODO: Make sure to replace the following address with http://metadata
 # whenever we got http://metadata resolving to url work successfully.
 metadata=$(curl http://[2a0a:e5c1:144::]:5000)
 
 ssh_key=$(echo $metadata | jq '.["ssh-key"]')
-ssh_key="${ssh_key:1:-1}"  # Removes quotation marks
+ssh_key=echo $metadata | sed 's/"//g'  # Removes quotation marks
+
+# ssh_key="${ssh_key:1:-1}"  # Removes quotation marks
 
 if ! grep -q "$ssh_key" $ssh_authorized_keys_path; then
 	echo $ssh_key >> $ssh_authorized_keys_path