Updated Branches: refs/heads/master e8fd65d86 -> 5ff1c52e4
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/5ff1c52e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5ff1c52e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5ff1c52e Branch: refs/heads/master Commit: 5ff1c52e4045e82e4f8bf45da9594d1231c31a5a Parents: 4e1f3f9 Author: Sheng Yang <[email protected]> Authored: Wed Oct 3 17:16:55 2012 -0700 Committer: Sheng Yang <[email protected]> Committed: Wed Oct 3 17:19:47 2012 -0700 ---------------------------------------------------------------------- .../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/5ff1c52e/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"
