You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by jz...@apache.org on 2012/11/29 00:05:39 UTC
[3/3] git commit: CS-16441: Clear /tmp for file locks when starting up
CS-16441: Clear /tmp for file locks when starting up
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a22f2c7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a22f2c7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a22f2c7a
Branch: refs/heads/4.0
Commit: a22f2c7ab0c4d7e86845079217f9faf21b5dc0ed
Parents: 032ac73
Author: Sheng Yang <sh...@citrix.com>
Authored: Wed Oct 3 17:16:55 2012 -0700
Committer: Joe Brockmeier <jz...@zonker.net>
Committed: Wed Nov 28 15:31:26 2012 -0600
----------------------------------------------------------------------
.../debian/config/etc/init.d/cloud-early-config | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a22f2c7a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index 8036359..7e58156 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -458,7 +458,6 @@ setup_redundant_router() {
mkdir -p /ramdisk
mount tmpfs /ramdisk -t tmpfs
mkdir -p /ramdisk/rrouter
- rm /tmp/rrouter.lock
ip route delete default
cp /root/redundant_router/keepalived.conf.templ /etc/keepalived/keepalived.conf
cp /root/redundant_router/conntrackd.conf.templ /etc/conntrackd/conntrackd.conf
@@ -816,6 +815,8 @@ change_password() {
}
start() {
+ # Clear /tmp for file lock
+ rm -f /tmp/*.lock
local hyp=$(hypervisor)
[ $? -ne 0 ] && log_it "Failed to detect hypervisor type, bailing out of early init" && exit 10
log_it "Detected that we are running inside $hyp guest"