git.iko.soy/searx
on master help sign in
[fix] determine path to makefile.lxc in a LXC
c89df67Markus Heiser
utils/lxc.sh+1−1
compare with master
unifiedsplit
@@ -20,7 +20,7 @@ lxc_set_suite_env
20
20
21LXC_HOST_PREFIX="${LXC_HOST_PREFIX:-test}"
21LXC_HOST_PREFIX="${LXC_HOST_PREFIX:-test}"
22
22
23−# where all folders from HOST are mounted
23+# Location in the container where all folders from HOST are mounted
24LXC_SHARE_FOLDER="/share"
24LXC_SHARE_FOLDER="/share"
25LXC_REPO_ROOT="${LXC_SHARE_FOLDER}/$(basename "${REPO_ROOT}")"
25LXC_REPO_ROOT="${LXC_SHARE_FOLDER}/$(basename "${REPO_ROOT}")"
26
26
utils/makefile.include+1−1
@@ -3,7 +3,7 @@
3ifeq (,$(wildcard /.lxcenv.mk))
3ifeq (,$(wildcard /.lxcenv.mk))
4PHONY += lxc-activate lxc-purge
4PHONY += lxc-activate lxc-purge
5lxc-activate:
5lxc-activate:
6− @$(MAKE) -s -f /share/searx/utils/makefile.lxc lxc-activate
6+ @$(MAKE) -s -f "$$(dirname $(abspath $(lastword $(MAKEFILE_LIST))))/makefile.lxc" lxc-activate
7lxc-purge:
7lxc-purge:
8 $(Q)rm -rf ./lxc
8 $(Q)rm -rf ./lxc
9else
9else