Switch to the FreeBSD built-in lockf instead of the package flock.

2024-05-04 12:23:56 -04:00 · 2024-05-04 12:23:56 -04:00 · faa9b7bb62
commit faa9b7bb62
parent 06fb8db40a
3 changed files with 1 additions and 3 deletions
--- a/ansible/roles/poudriere/files/poudboot.bash
+++ b/ansible/roles/poudriere/files/poudboot.bash
@ -38,7 +38,7 @@ function log {

 function run_locked {
    if [ "${RUN_LOCKED:-}" != "RUN" ]; then
-        exec env RUN_LOCKED=RUN flock --nonblock $LOCKFILE $0 $@
+        exec env RUN_LOCKED=RUN lockf -t 0 $LOCKFILE $0 $@
    fi

 }
--- a/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-pkglist
+++ b/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-pkglist
@ -82,7 +82,6 @@ sysutils/cpu-microcode
 sysutils/ddrescue
 sysutils/dsbmd
 sysutils/exfat-utils
-sysutils/flock
 sysutils/fusefs-exfat
 sysutils/fusefs-simple-mtpfs
 sysutils/fusefs-sshfs
--- a/ansible/roles/poudriere/tasks/freebsd.yaml
+++ b/ansible/roles/poudriere/tasks/freebsd.yaml
@ -26,7 +26,6 @@
      - poudriere
      - bash
      - rsync
-      - flock
    state: present

 - name: Create directories