From 062e94a317130bf5478b96e04689addbbe473df2 Mon Sep 17 00:00:00 2001
From: Matty Courtney <matty.courtney@citrix.com>
Date: Tue, 25 Sep 2012 15:42:28 -0700
Subject: [PATCH] CLOUDSTACK-196: cloud-set-guest-password enhancement to
 support Debian (and derivatives)

Signed-off-by: Edison Su <sudison@gmail.com>
---
 tools/guest_password/cloud-set-guest-password | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/guest_password/cloud-set-guest-password b/tools/guest_password/cloud-set-guest-password
index 97e6e3d7bee..3da0ff36191 100644
--- a/tools/guest_password/cloud-set-guest-password
+++ b/tools/guest_password/cloud-set-guest-password
@@ -27,7 +27,7 @@
 user=root
 
 # Add your DHCP lease folders here
-DHCP_FOLDERS="/var/lib/dhclient/* /var/lib/dhcp3/*"
+DHCP_FOLDERS="/var/lib/dhclient/* /var/lib/dhcp3/* /var/lib/dhcp/*"
 password_received=0
 file_count=0
 error_count=0
@@ -95,7 +95,7 @@ then
 fi
 
 logger -t "cloud" "Changing password ..."
-echo $password | passwd --stdin $user
+echo $user:$password | chpasswd
 						
 if [ $? -gt 0 ]
 then