Merge remote-tracking branch 'origin/passwd-l'

Conflicts:
	slapprepare/slapprepare/__init__.py

slapprepare/slapprepare/script/slapos

@@ -84,11 +84,6 @@ else
     sed -i "/${SLAPVPN}/ s/^\([^#]\)/#\1/g" $SLAPOS_CONFIGURATION/slapos.cfg
 fi
 
-
-
-# set random root password
-pwgen -sync 512 1 | passwd --stdin root
-
 SLAP_INSTALL_LOG=/opt/slapos/slapos-install.log
 
 while :; do

slapprepare/slapprepare/slapprepare.py

@@ -324,6 +324,9 @@ def slapserver(config):
           if not dry_run:
             os.remove(path)
 
+    # Disable login by password for root
+    _call(['passwd','-d','root'])
+
   finally:
     print "SlapOS Image configuration: DONE"
     return 0

slapprepare/slapprepare/template/sshd_config.in

-PermitRootLogin yes
+PermitRootLogin without-password
 AllowUsers root
 AddressFamily any