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 bb77d1a30f5fe0eb2df8dc43d5abbfc8b80dcdb3..539f2eb6c3badfe173022b0f7fc0e05959bdfebd 100755 (executable)
--- a/fai/config/scripts/DEBIAN/10-rootpw
+++ b/fai/config/scripts/DEBIAN/10-rootpw
@@ -4,11 +4,9 @@ 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
-    # enable sudo for user
-    ainsl /etc/sudoers "$username   ALL = ALL"
 fi
 
 exit $error