Commit 8e9e71c0 authored by Bastian Blank's avatar Bastian Blank Committed by Joerg Jaspert

Handle reboot-lock like any other lock

parent 11d152ff
# FUNC ARGS TIME ERR BG
LOCK DEPLOY 600 shared false
INCLUDE lock none true false
# Note: Not explicitly unlocked, want it until cronscript ends, after
# all background functions finished
LOCK UNCHECKED 3600 exclusive false
......
# FUNC ARGS TIME ERR BG
LOCK DEPLOY 600 shared false
INCLUDE lock none true false
importusers none none false false
builddautosigning security none false false
# FUNC ARGS TIME ERR BG
INCLUDE lock none true false
STATE startup none false false
LOCK DEPLOY 600 shared false
LOCK DAILY 3600 exclusive false
RMSTAGE none none false false
NOSTAGE startup none false false
......
# FUNC ARGS TIME ERR BG
LOCK DEPLOY 600 shared false
INCLUDE lock none true false
LOCK UNCHECKED 1200 exclusive false
update_releases none none true false
INCLUDE mirror none true true
......
......@@ -304,16 +304,6 @@ function laststeps() {
}
(
LOCKFREE=0
flock --shared --nonblock 42 || LOCKFREE=1
# Did we get the lock? (It's shared, so usually we will. But DSA
# can take an exclusive one in preparation for a reboot)
if [[ ${LOCKFREE} -gt 0 ]]; then
echo "Couldn't get (shared) reboot lock"
laststeps 1
fi
# Where we store lockfile filehandles
declare -A LOCKFD
......@@ -361,6 +351,4 @@ function laststeps() {
log "Cron script successful, all done"
laststeps 0
# And end the reboot-locked part
) 42</var/run/reboot-lock
)
# FUNC ARGS TIME ERR BG
LOCK DEPLOY 600 shared false
INCLUDE lock none true false
wnppbugs none none false false
pushfilesdb none none false false
wbdump none none false false
......
# FUNC ARGS TIME ERR BG
INCLUDE lock none true false
STATE startup none false false
LOCK DEPLOY 600 shared false
LOCK DAILY 3600 exclusive false
NOSTAGE startup none false false
savetimestamp none none false false
......
# FUNC ARGS TIME ERR BG
LOCK DEPLOY 600 shared false
INCLUDE lock none true false
importusers none none false false
queuereport none none false true
removalstxt none none false true
......
# FUNC ARGS TIME ERR BG
LOCK /run/reboot-lock 0 shared false
LOCK DEPLOY 600 shared false
# FUNC ARGS TIME ERR BG
LOCK DEPLOY 600 shared false
INCLUDE lock none true false
mirror none none true false
mirrorpush none none true false
# FUNC ARGS TIME ERR BG
LOCK DEPLOY 600 shared false
INCLUDE lock none true false
rotatelog none none false true
rotatequeued none none false true
archivequeuedone none none false true
......
# FUNC ARGS TIME ERR BG
LOCK DEPLOY 600 shared false
INCLUDE lock none true false
LOCK DAILY 600 shared false
LOCK UNCHECKED 600 exclusive false
pg_timestamp preunchecked none true false
......
# FUNC ARGS TIME ERR BG
LOCK DEPLOY 600 shared false
INCLUDE lock none true false
purgeempty none none false true
gitcleanup none none false true
fixsymlinks none none false true
......
# FUNC ARGS TIME ERR BG
LOCK DEPLOY 600 shared false
INCLUDE lock none true false
removalsarchive none none false false
# FUNC ARGS TIME ERR BG
LOCK /run/reboot-lock 0 shared false
LOCK DEPLOY 120 exclusive false
RMSTAGE none none true false
fetch_updates none none true false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment