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 c1ee0b18f725043592835d9091eef6e53b60c7e5..539f2eb6c3badfe173022b0f7fc0e05959bdfebd 100755 (executable)
--- a/fai/config/scripts/DEBIAN/10-rootpw
+++ b/fai/config/scripts/DEBIAN/10-rootpw
@@ -3,6 +3,10 @@
 error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
 
 # set root password
-$ROOTCMD usermod -p "$ROOTPW" root
+if [ -n "$ROOTPW" ]; then
+    $ROOTCMD chpasswd --encrypted <<< "root:${ROOTPW}"
+elif [ -n "$username" ]; then
+    $ROOTCMD usermod -L root
+fi
 
 exit $error