From d175a0fb7bdcc00632a9092f5de1037f0dd1d811 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Sat, 26 Dec 2020 11:43:18 +0100
Subject: [PATCH] [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>
---
 utils/lib.sh           | 6 +++---
 utils/makefile.include | 2 +-
 utils/makefile.lxc     | 7 +++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/utils/lib.sh b/utils/lib.sh
index 878e7df3..83dd7507 100755
--- a/utils/lib.sh
+++ b/utils/lib.sh
@@ -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() {
@@ -1413,8 +1413,8 @@ LXC_BASE_PACKAGES_centos="bash git python3"
 case $DIST_ID in
     ubuntu|debian) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_debian}" ;;
     arch)          LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_arch}" ;;
-    fedora) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_fedora}" ;;
-    centos) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_centos}" ;;
+    fedora)        LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_fedora}" ;;
+    centos)        LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_centos}" ;;
     *) err_msg "$DIST_ID-$DIST_VERS: pkg_install LXC_BASE_PACKAGES not yet implemented" ;;
 esac
 
diff --git a/utils/makefile.include b/utils/makefile.include
index 35a5134d..879dcc23 100644
--- a/utils/makefile.include
+++ b/utils/makefile.include
@@ -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
diff --git a/utils/makefile.lxc b/utils/makefile.lxc
index fd999e40..95a8d431 100644
--- a/utils/makefile.lxc
+++ b/utils/makefile.lxc
@@ -9,10 +9,10 @@
 #   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)'
+	@echo  '  LXC: running in container LXC_ENV_FOLDER=$(LXC_ENV_FOLDER)'
 
 # If not activated, serve target 'lxc-activate' ..
 ifeq (,$(wildcard /.lxcenv.mk))
@@ -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)