From 1946a9a583f10d7e82edd270d8819e82add48d75 Mon Sep 17 00:00:00 2001
From: Anthony Xu <anthony@cloud.com>
Date: Tue, 25 Sep 2012 15:28:27 -0700
Subject: [PATCH] VPC : password reset,       add console redirect

---
 patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh | 2 +-
 patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh b/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh
index 1db7fb72bb7..abb1dad88e7 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh
+++ b/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh
@@ -105,7 +105,7 @@ vpcrouting_svcs() {
    chkconfig keepalived off
    chkconfig conntrackd off
    chkconfig apache2 off
-   echo "ssh haproxy dnsmasq" >> /var/cache/cloud/enabled_svcs
+   echo "ssh haproxy dnsmasq" > /var/cache/cloud/enabled_svcs
    echo "cloud cloud-passwd-srvr apache2 nfs-common portmap keepalived conntrackd" > /var/cache/cloud/disabled_svcs
 }
 
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh b/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh
index 8f1e0063979..90de218f471 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh
+++ b/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh
@@ -103,7 +103,7 @@ desetup_dnsmasq() {
 
 setup_passwdsvcs() {
   logger -t cloud "Setting up password service for network $ip/$mask, eth $dev "
-  nohup bash /opt/cloud/bin/vpc_passwd_server $ip &
+  nohup bash /opt/cloud/bin/vpc_passwd_server $ip >/dev/null 2>&1 &
 }
 
 desetup_passwdsvcs() {