[Ovirt-devel] [PATCH node] set root password only by default

[Alan Pevec]

SASL users for libvirt remote access are optional

Signed-off-by: Alan Pevec <apevec at redhat.com>
---
 scripts/ovirt-config-password |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/scripts/ovirt-config-password b/scripts/ovirt-config-password
index 5070b49..92c45ae 100755
--- a/scripts/ovirt-config-password
+++ b/scripts/ovirt-config-password
@@ -14,10 +14,6 @@ trap 'exit $?' 1 2 13 15
 # and add USER to the SASL list for libvirt.
 function set_sasl_password {
     user=$1
-    if [ "$user" = "root" ]; then
-        printf "\nSystem Administrator ($user):\n"
-        passwd "$user"
-    fi
 
     printf "\nNode SASL User ($user):\n"
     saslpasswd2 -a libvirt "$user"
@@ -37,9 +33,9 @@ function prompt_sasl_user {
 printf "\n\n oVirt Node Password Configuration\n\n"
 
 # prompt user
-#Check for the root user first
-set_sasl_password root
-#Check for any sasl users
-printf "\nAdding new SASL users for libvirt"
+# Set the password for the root user first
+printf "\nSystem Administrator (root):\n"
+passwd root
+printf "\nAdding users for libvirt remote access"
 # TODO list existing users in /etc/libvirt/passwd.db
 while prompt_sasl_user; do :; done
-- 
1.6.0.6