[12/12] git commit: CLOUDSTACK-196: cloud-set-guest-password enhancement to support Debian (and derivatives)

[ts...@apache.org]

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

Synced fix on setup/bindir/cloud-set-guest-password.in too.
Note: we've duplicate files, one in tools

Signed-off-by: Rohit Yadav <bh...@apache.org>


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

Branch: refs/heads/marvin-parallel
Commit: 6c6d036447d085aa313658abd32fce78e096005c
Parents: 5e2c1ef
Author: Rohit Yadav <bh...@apache.org>
Authored: Sun Oct 28 15:39:42 2012 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Sun Oct 28 15:39:42 2012 +0530

----------------------------------------------------------------------
 setup/bindir/cloud-set-guest-password.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6c6d0364/setup/bindir/cloud-set-guest-password.in
----------------------------------------------------------------------
diff --git a/setup/bindir/cloud-set-guest-password.in b/setup/bindir/cloud-set-guest-password.in
index 69be175..3215894 100755
--- a/setup/bindir/cloud-set-guest-password.in
+++ b/setup/bindir/cloud-set-guest-password.in
@@ -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