Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d175a0fb authored by Markus Heiser's avatar Markus Heiser
Browse files

[mod] LXC_ENV_FOLDER moved from ./lxc to ./lxc-env 



BTW:

- add target $(LXC_ENV_FOLDER)
- fix indentations

Signed-off-by: default avatarMarkus Heiser <markus.heiser@darmarit.de>
parent bc7bd1d8

utils/lib.sh

+3 −3
Original line number Diff line number Diff line
@@ -1381,7 +1381,7 @@ in_container() { 
LXC_ENV_FOLDER=

if in_container; then

    # shellcheck disable=SC2034

    LXC_ENV_FOLDER="lxc/$(hostname)/"

    LXC_ENV_FOLDER="lxc-env/$(hostname)/"

fi



lxc_init_container_env() {

utils/makefile.include

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ PHONY += lxc-activate lxc-purge 
lxc-activate:

	@$(MAKE) -s -f "$$(dirname $(abspath $(lastword $(MAKEFILE_LIST))))/makefile.lxc" lxc-activate

lxc-purge:

	$(Q)rm -rf ./lxc

	$(Q)rm -rf ./lxc-env

else

	include /.lxcenv.mk

endif

utils/makefile.lxc

+5 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#   sudo make ./utils/makefile.lxc lxc-activate

#   sudo make ./utils/makefile.lxc lxc-deactivate



LXC_ENV_FOLDER=lxc/$(shell hostname)/

LXC_ENV_FOLDER=lxc-env/$(shell hostname)/



lxc-help::

	@echo  '  LXC: running in container LXC_ENV_FOLDER=$(LXC_ENV_FOLDER)'
@@ -24,6 +24,9 @@ else 
PHONY += lxc-deactivate

lxc-deactivate:

	rm /.lxcenv.mk

$(LXC_ENV_FOLDER):

	$(Q)mkdir -p $(LXC_ENV_FOLDER)

	$(Q)echo placeholder > $(LXC_ENV_FOLDER).placeholder

endif



.PHONY: $(PHONY)