summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPÁLI Gábor János <pali.gabor@gmail.com>2024-01-06 21:26:18 +0100
committerPÁLI Gábor János <pali.gabor@gmail.com>2024-01-06 21:33:05 +0100
commitacb81bcdd3089959632d010df6e08e38b79e12ac (patch)
tree645d545c963af96bbe6741abe5d5a076a4be99bf
parentb9dd052d01b6023d2df172bd53507ac0c48b5c13 (diff)
downloadfreebsd-wifibox-alpine-acb81bcdd3089959632d010df6e08e38b79e12ac.zip
Try unmounting `linprocfs` for non-root users as well.
During the build process, the `proc` directory under the image root is left over on FreeBSD 13 (and later) even for non-root users. Lift the restriction on the root-user case and make an attempt to unmount this file system in every case.
-rw-r--r--Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index d1b4271..82d3385 100644
--- a/Makefile
+++ b/Makefile
@@ -106,11 +106,9 @@ $(GUESTDIR)/.done:
$(ENV) LD_LIBRARY_PATH=$(BOOTSTRAPDIR)/lib \
$(_BUSYBOX) \
depmod -A -b $(GUESTDIR) $$($(LS) $(GUESTDIR)/lib/modules)
- # try umounting `linprocfs` if that was mounted (on FreeBSD 13
- # or later), usually happens for `root`
-.if $(UID) == 0
+ # try unmounting `linprocfs` if that was mounted (on FreeBSD 13
+ # or later)
$(UMOUNT) $(GUESTDIR)/proc || $(TRUE)
-.endif
# install extra files manually
.if exists($(PWD)/guest)
$(CP) -R $(PWD)/guest/ $(GUESTDIR)