diff options
| -rwxr-xr-x | utils/lib.sh | 10 | ||||
| -rwxr-xr-x | utils/lxc.sh | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/utils/lib.sh b/utils/lib.sh index 85ac77456..9d5068646 100755 --- a/utils/lib.sh +++ b/utils/lib.sh @@ -1073,7 +1073,7 @@ in_container() { # to be safe, take a look at the environment of process 1 (/sbin/init) # grep -qa 'container=lxc' /proc/1/environ - # see lxc_init_container + # see lxc_init_container_env [[ -f /.lxcenv ]] } @@ -1083,12 +1083,12 @@ if in_container; then LXC_ENV_FOLDER="lxc/$(hostname)/" fi -lxc_init_container() { +lxc_init_container_env() { - # Create a /.lxcenv file in the root folder. Call this once after container - # is inital started. + # usage: lxc_init_container_env <name> - # usage: lxc_create_root_dot_lxcenv <name> + # Create a /.lxcenv file in the root folder. Call this once after the + # container is inital started and before installing any boilerplate stuff. info_msg "create /.lxcenv in container $1" cat <<EOF | lxc exec "${1}" -- bash | prefix_stdout "[${_BBlue}${1}${_creset}] " diff --git a/utils/lxc.sh b/utils/lxc.sh index 92dfff2d1..9eb28f498 100755 --- a/utils/lxc.sh +++ b/utils/lxc.sh @@ -538,6 +538,7 @@ lxc_install_boilerplate() { if lxc start -q "${container_name}" &>/dev/null; then sleep 5 # guest needs some time to come up and get an IP fi + lxc_init_container_env "${container_name}" info_msg "[${_BBlue}${container_name}${_creset}] install /.lxcenv.mk .." cat <<EOF | lxc exec "${container_name}" -- bash | prefix_stdout "[${_BBlue}${container_name}${_creset}] " rm -f "/.lxcenv.mk" |