From 5ff1c52e4045e82e4f8bf45da9594d1231c31a5a Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Wed, 3 Oct 2012 17:16:55 -0700
Subject: [PATCH] CS-16441: Clear /tmp for file locks when starting up

---
 patches/systemvm/debian/config/etc/init.d/cloud-early-config | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 803635989f9..7e5815682a8 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"