Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 58B02D66A for ; Thu, 27 Sep 2012 00:42:45 +0000 (UTC) Received: (qmail 55949 invoked by uid 500); 27 Sep 2012 00:42:44 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 55909 invoked by uid 500); 27 Sep 2012 00:42:44 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 55801 invoked by uid 99); 27 Sep 2012 00:42:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Sep 2012 00:42:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 10C1C3924B; Thu, 27 Sep 2012 00:42:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anthonyxu@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/7] git commit: VPC : password reset, add console redirect Message-Id: <20120927004244.10C1C3924B@tyr.zones.apache.org> Date: Thu, 27 Sep 2012 00:42:43 +0000 (UTC) VPC : password reset, add console redirect Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1946a9a5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1946a9a5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1946a9a5 Branch: refs/heads/master Commit: 1946a9a583f10d7e82edd270d8819e82add48d75 Parents: ddffdc9 Author: Anthony Xu Authored: Tue Sep 25 15:28:27 2012 -0700 Committer: Anthony Xu Committed: Wed Sep 26 17:42:42 2012 -0700 ---------------------------------------------------------------------- .../debian/config/opt/cloud/bin/patchsystemvm.sh | 2 +- .../debian/config/opt/cloud/bin/vpc_guestnw.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1946a9a5/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh ---------------------------------------------------------------------- diff --git a/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh b/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh index 1db7fb7..abb1dad 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 } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1946a9a5/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh ---------------------------------------------------------------------- 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 8f1e006..90de218 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() {