Updated Branches:
  refs/heads/master c9a0cca60 -> 062e94a31

CLOUDSTACK-196: cloud-set-guest-password enhancement to support Debian
(and derivatives)

Signed-off-by: Edison Su <[email protected]>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/062e94a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/062e94a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/062e94a3

Branch: refs/heads/master
Commit: 062e94a317130bf5478b96e04689addbbe473df2
Parents: c9a0cca
Author: Matty Courtney <[email protected]>
Authored: Tue Sep 25 15:42:28 2012 -0700
Committer: Edison Su <[email protected]>
Committed: Tue Sep 25 15:42:28 2012 -0700

----------------------------------------------------------------------
 tools/guest_password/cloud-set-guest-password |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/062e94a3/tools/guest_password/cloud-set-guest-password
----------------------------------------------------------------------
diff --git a/tools/guest_password/cloud-set-guest-password 
b/tools/guest_password/cloud-set-guest-password
index 97e6e3d..3da0ff3 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

Reply via email to