diff --git a/patches/systemvm/debian/config/root/edithosts.sh b/patches/systemvm/debian/config/root/edithosts.sh index acd00d031c4..cb22f8a3ea7 100755 --- a/patches/systemvm/debian/config/root/edithosts.sh +++ b/patches/systemvm/debian/config/root/edithosts.sh @@ -48,13 +48,6 @@ then exit 1 fi -lock_rr="rrouter" -locked_rr=$(getLockFile $lock_rr) -if [ "$locked_rr" != "1" ] -then - exit 1 -fi - grep "redundant_router=1" /var/cache/cloud/cmdline > /dev/null no_redundant=$? @@ -136,5 +129,4 @@ else fi ret=$? -releaseLockFile $lock_rr $locked_rr unlock_exit $ret $lock $locked diff --git a/patches/systemvm/debian/config/root/func.sh b/patches/systemvm/debian/config/root/func.sh index c1a73441708..7fb797c10ac 100644 --- a/patches/systemvm/debian/config/root/func.sh +++ b/patches/systemvm/debian/config/root/func.sh @@ -1,7 +1,6 @@ #!/bin/bash -# IMPORTANT: Ordering of lock: -# biglock --> rrouter +# Only one lock is allowed: biglock # getLockFile() parameters # $1 lock filename diff --git a/patches/systemvm/debian/config/root/redundant_router/backup.sh.templ b/patches/systemvm/debian/config/root/redundant_router/backup.sh.templ index 394e9a7aae2..8378f64663d 100644 --- a/patches/systemvm/debian/config/root/redundant_router/backup.sh.templ +++ b/patches/systemvm/debian/config/root/redundant_router/backup.sh.templ @@ -2,7 +2,7 @@ source /root/func.sh -lock="rrouter" +lock="biglock" locked=$(getLockFile $lock) if [ "$locked" != "1" ] then diff --git a/patches/systemvm/debian/config/root/redundant_router/checkrouter.sh.templ b/patches/systemvm/debian/config/root/redundant_router/checkrouter.sh.templ index d43c181e2d8..c1baf191ec4 100755 --- a/patches/systemvm/debian/config/root/redundant_router/checkrouter.sh.templ +++ b/patches/systemvm/debian/config/root/redundant_router/checkrouter.sh.templ @@ -2,7 +2,7 @@ source /root/func.sh -lock="rrouter" +lock="biglock" locked=$(getLockFile $lock) if [ "$locked" != "1" ] then diff --git a/patches/systemvm/debian/config/root/redundant_router/fault.sh.templ b/patches/systemvm/debian/config/root/redundant_router/fault.sh.templ index c29dd3d7893..2305fb24c0a 100644 --- a/patches/systemvm/debian/config/root/redundant_router/fault.sh.templ +++ b/patches/systemvm/debian/config/root/redundant_router/fault.sh.templ @@ -2,7 +2,7 @@ source /root/func.sh -lock="rrouter" +lock="biglock" locked=$(getLockFile $lock) if [ "$locked" != "1" ] then diff --git a/patches/systemvm/debian/config/root/redundant_router/master.sh.templ b/patches/systemvm/debian/config/root/redundant_router/master.sh.templ index 3c07f3ef860..c8d06374de2 100644 --- a/patches/systemvm/debian/config/root/redundant_router/master.sh.templ +++ b/patches/systemvm/debian/config/root/redundant_router/master.sh.templ @@ -2,7 +2,7 @@ source /root/func.sh -lock="rrouter" +lock="biglock" locked=$(getLockFile $lock) if [ "$locked" != "1" ] then