Merge branch 'upstream'

[automated-distro-installer] / fai / config / scripts / DEBIAN / 10-rootpw

diff --git a/fai/config/scripts/DEBIAN/10-rootpw b/fai/config/scripts/DEBIAN/10-rootpw
index 7a7f6177a30e398311f8b1659f61114487947767..539f2eb6c3badfe173022b0f7fc0e05959bdfebd 100755 (executable)
--- a/fai/config/scripts/DEBIAN/10-rootpw
+++ b/fai/config/scripts/DEBIAN/10-rootpw
@@ -4,8 +4,8 @@ error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
 
 # set root password
 if [ -n "$ROOTPW" ]; then
-    $ROOTCMD usermod -p "$ROOTPW" root
-else
+    $ROOTCMD chpasswd --encrypted <<< "root:${ROOTPW}"
+elif [ -n "$username" ]; then
     $ROOTCMD usermod -L root
 fi