mirror of https://github.com/searxng/searxng.git
[mod] LXC_ENV_FOLDER moved from ./lxc to ./lxc-env
BTW: - add target $(LXC_ENV_FOLDER) - fix indentations Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
parent
bc7bd1d80a
commit
d175a0fb7b
|
@ -1381,7 +1381,7 @@ in_container() {
|
||||||
LXC_ENV_FOLDER=
|
LXC_ENV_FOLDER=
|
||||||
if in_container; then
|
if in_container; then
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
LXC_ENV_FOLDER="lxc/$(hostname)/"
|
LXC_ENV_FOLDER="lxc-env/$(hostname)/"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
lxc_init_container_env() {
|
lxc_init_container_env() {
|
||||||
|
|
|
@ -5,7 +5,7 @@ PHONY += lxc-activate lxc-purge
|
||||||
lxc-activate:
|
lxc-activate:
|
||||||
@$(MAKE) -s -f "$$(dirname $(abspath $(lastword $(MAKEFILE_LIST))))/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-env
|
||||||
else
|
else
|
||||||
include /.lxcenv.mk
|
include /.lxcenv.mk
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -9,10 +9,10 @@
|
||||||
# sudo make ./utils/makefile.lxc lxc-activate
|
# sudo make ./utils/makefile.lxc lxc-activate
|
||||||
# sudo make ./utils/makefile.lxc lxc-deactivate
|
# sudo make ./utils/makefile.lxc lxc-deactivate
|
||||||
|
|
||||||
LXC_ENV_FOLDER=lxc/$(shell hostname)/
|
LXC_ENV_FOLDER=lxc-env/$(shell hostname)/
|
||||||
|
|
||||||
lxc-help::
|
lxc-help::
|
||||||
@echo 'LXC: running in container LXC_ENV_FOLDER=$(LXC_ENV_FOLDER)'
|
@echo ' LXC: running in container LXC_ENV_FOLDER=$(LXC_ENV_FOLDER)'
|
||||||
|
|
||||||
# If not activated, serve target 'lxc-activate' ..
|
# If not activated, serve target 'lxc-activate' ..
|
||||||
ifeq (,$(wildcard /.lxcenv.mk))
|
ifeq (,$(wildcard /.lxcenv.mk))
|
||||||
|
@ -24,6 +24,9 @@ else
|
||||||
PHONY += lxc-deactivate
|
PHONY += lxc-deactivate
|
||||||
lxc-deactivate:
|
lxc-deactivate:
|
||||||
rm /.lxcenv.mk
|
rm /.lxcenv.mk
|
||||||
|
$(LXC_ENV_FOLDER):
|
||||||
|
$(Q)mkdir -p $(LXC_ENV_FOLDER)
|
||||||
|
$(Q)echo placeholder > $(LXC_ENV_FOLDER).placeholder
|
||||||
endif
|
endif
|
||||||
|
|
||||||
.PHONY: $(PHONY)
|
.PHONY: $(PHONY)
|
||||||
|
|
Loading…
Reference in New Issue