diff --git a/ansible/roles/poudriere/files/poudboot.bash b/ansible/roles/poudriere/files/poudboot.bash index 40ffe53..375115c 100644 --- 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 } diff --git a/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-pkglist b/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-pkglist index 81c5f3f..bf9fbf5 100644 --- 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 diff --git a/ansible/roles/poudriere/tasks/freebsd.yaml b/ansible/roles/poudriere/tasks/freebsd.yaml index 9311953..86470ae 100644 --- 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