summaryrefslogtreecommitdiff
path: root/scripts/build/binary_grub-pc
diff options
context:
space:
mode:
authorjnqnfe <jnqnfe@gmail.com>2015-02-05 03:30:47 +0000
committerLyndon Brown <jnqnfe@gmail.com>2020-03-13 15:37:38 +0000
commitb27927724a5da017796d16de47979116d01455dc (patch)
treed8ca219d15a873198be13b8feb1d3ad8a10b63c8 /scripts/build/binary_grub-pc
parent346e3e1c36f8dc61e93fdd76dd28174d85e2aa5d (diff)
downloadvyos-live-build-b27927724a5da017796d16de47979116d01455dc.tar.gz
vyos-live-build-b27927724a5da017796d16de47979116d01455dc.zip
locks: tidy lock acquisition
Combine the check+create done in each script. (The original functions are still callable as before, but a new combined `Aquire_lockfile` function can be called instead, as now used). Note, a further simplification could be done in removing the passing of the lock filename in as a parameter since every use of the functions is with ".lock". The lock functions already have a fallback to ".build/lock" though. Checking the history, the fallback used to be for a system wide lock, which was then replaced with this config-tree specific one. As long as that is not used implicitly by 3rd-party hooks then surely we are free to change the fallback to ".lock" and further remove passing in a name as a param...? history: db5d2b0dcdae96e712661605e17bc9875e224f9f 0aa8289a3773fd8a3885090b72622c2f95ab099c Gbp-Dch: Short Closes: #952918
Diffstat (limited to 'scripts/build/binary_grub-pc')
-rwxr-xr-xscripts/build/binary_grub-pc7
1 files changed, 2 insertions, 5 deletions
diff --git a/scripts/build/binary_grub-pc b/scripts/build/binary_grub-pc
index c2ad7d7af..433f35370 100755
--- a/scripts/build/binary_grub-pc
+++ b/scripts/build/binary_grub-pc
@@ -31,11 +31,8 @@ Require_stagefile .build/config .build/bootstrap
# Checking stage file
Check_stagefile .build/binary_grub
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
+# Aquire lock file
+Acquire_lockfile
# Check architecture
Check_architectures amd64 i386