ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #2399 from return42/fix-lxc 

[fix] determine path to makefile.lxc in a LXC
This commit is contained in:
Alexandre Flament 2020-12-20 09:32:00 +01:00 committed by GitHub
parent 32e4eab336 c89df6739f
commit 72d2bb2289
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/lxc.sh
View File

@ -20,7 +20,7 @@ lxc_set_suite_env
LXC_HOST_PREFIX="${LXC_HOST_PREFIX:-test}" LXC_HOST_PREFIX="${LXC_HOST_PREFIX:-test}"
# where all folders from HOST are mounted # Location in the container where all folders from HOST are mounted
LXC_SHARE_FOLDER="/share" LXC_SHARE_FOLDER="/share"
LXC_REPO_ROOT="${LXC_SHARE_FOLDER}/$(basename "${REPO_ROOT}")" LXC_REPO_ROOT="${LXC_SHARE_FOLDER}/$(basename "${REPO_ROOT}")"

2
utils/makefile.include
View File

@ -3,7 +3,7 @@
ifeq (,$(wildcard /.lxcenv.mk)) ifeq (,$(wildcard /.lxcenv.mk))
PHONY += lxc-activate lxc-purge PHONY += lxc-activate lxc-purge
lxc-activate: lxc-activate:
@$(MAKE) -s -f /share/searx/utils/makefile.lxc lxc-activate @$(MAKE) -s -f "$$(dirname $(abspath $(lastword $(MAKEFILE_LIST))))/makefile.lxc" lxc-activate
lxc-purge: lxc-purge:
$(Q)rm -rf ./lxc $(Q)rm -rf ./lxc
else else