git.iko.soy/searx
on master help sign in
[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>

commitd175a0fb7bdcc00632a9092f5de1037f0dd1d811 authorMarkus Heiser <markus.heiser@darmarit.de> dateSat 26 Dec 2020, 11:43 (6 years ago) parentbc7bd1d
3 files changed+9−6
compare with master
unifiedsplit
utils/lib.sh+3−3 utils/makefile.include+1−1 utils/makefile.lxc+5−2
utils/lib.sh+3−3
@@ -1381,7 +1381,7 @@ in_container() {
13811381LXC_ENV_FOLDER=
13821382if in_container; then
13831383 # shellcheck disable=SC2034
1384− LXC_ENV_FOLDER="lxc/$(hostname)/"
1384+ LXC_ENV_FOLDER="lxc-env/$(hostname)/"
13851385fi
13861386
13871387lxc_init_container_env() {
@@ -1413,8 +1413,8 @@ LXC_BASE_PACKAGES_centos="bash git python3"
14131413case $DIST_ID in
14141414 ubuntu|debian) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_debian}" ;;
14151415 arch) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_arch}" ;;
1416− fedora) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_fedora}" ;;
1417− centos) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_centos}" ;;
1416+ fedora) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_fedora}" ;;
1417+ centos) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_centos}" ;;
14181418 *) err_msg "$DIST_ID-$DIST_VERS: pkg_install LXC_BASE_PACKAGES not yet implemented" ;;
14191419esac
14201420
utils/makefile.include+1−1
@@ -5,7 +5,7 @@ PHONY += lxc-activate lxc-purge
55lxc-activate:
66 @$(MAKE) -s -f "$$(dirname $(abspath $(lastword $(MAKEFILE_LIST))))/makefile.lxc" lxc-activate
77lxc-purge:
8− $(Q)rm -rf ./lxc
8+ $(Q)rm -rf ./lxc-env
99else
1010 include /.lxcenv.mk
1111endif
utils/makefile.lxc+5−2
@@ -9,10 +9,10 @@
99# sudo make ./utils/makefile.lxc lxc-activate
1010# sudo make ./utils/makefile.lxc lxc-deactivate
1111
12−LXC_ENV_FOLDER=lxc/$(shell hostname)/
12+LXC_ENV_FOLDER=lxc-env/$(shell hostname)/
1313
1414lxc-help::
15− @echo 'LXC: running in container LXC_ENV_FOLDER=$(LXC_ENV_FOLDER)'
15+ @echo ' LXC: running in container LXC_ENV_FOLDER=$(LXC_ENV_FOLDER)'
1616
1717# If not activated, serve target 'lxc-activate' ..
1818ifeq (,$(wildcard /.lxcenv.mk))
@@ -24,6 +24,9 @@ else
2424PHONY += lxc-deactivate
2525lxc-deactivate:
2626 rm /.lxcenv.mk
27+$(LXC_ENV_FOLDER):
28+ $(Q)mkdir -p $(LXC_ENV_FOLDER)
29+ $(Q)echo placeholder > $(LXC_ENV_FOLDER).placeholder
2730endif
2831
2932.PHONY: $(PHONY)