Compare commits
No commits in common. "c2530348ee6c547b24a600e3a2992d2e208c46c0" and "4e8067e4858aea40496b1225c0eb04956d5ec982" have entirely different histories.
c2530348ee
...
4e8067e485
@ -244,8 +244,6 @@ base_settings() {
|
|||||||
SSH_AUTHORIZED_KEY=""
|
SSH_AUTHORIZED_KEY=""
|
||||||
TAGS="community-script;"
|
TAGS="community-script;"
|
||||||
UDHCPC_FIX=""
|
UDHCPC_FIX=""
|
||||||
ENABLE_FUSE=="0"
|
|
||||||
ENABLE_TUN="0"
|
|
||||||
|
|
||||||
# Override default settings with variables from ct script
|
# Override default settings with variables from ct script
|
||||||
CT_TYPE=${var_unprivileged:-$CT_TYPE}
|
CT_TYPE=${var_unprivileged:-$CT_TYPE}
|
||||||
@ -254,8 +252,6 @@ base_settings() {
|
|||||||
RAM_SIZE=${var_ram:-$RAM_SIZE}
|
RAM_SIZE=${var_ram:-$RAM_SIZE}
|
||||||
VERBOSE=${var_verbose:-$VERBOSE}
|
VERBOSE=${var_verbose:-$VERBOSE}
|
||||||
TAGS="${TAGS}${var_tags:-}"
|
TAGS="${TAGS}${var_tags:-}"
|
||||||
ENABLE_FUSE="${var_fuse:-$ENABLE_FUSE}"
|
|
||||||
ENABLE_TUN="${var_tun:-$ENABLE_TUN}"
|
|
||||||
|
|
||||||
# Since these 2 are only defined outside of default_settings function, we add a temporary fallback. TODO: To align everything, we should add these as constant variables (e.g. OSTYPE and OSVERSION), but that would currently require updating the default_settings function for all existing scripts
|
# Since these 2 are only defined outside of default_settings function, we add a temporary fallback. TODO: To align everything, we should add these as constant variables (e.g. OSTYPE and OSVERSION), but that would currently require updating the default_settings function for all existing scripts
|
||||||
if [ -z "$var_os" ]; then
|
if [ -z "$var_os" ]; then
|
||||||
@ -962,17 +958,6 @@ build_container() {
|
|||||||
FEATURES="nesting=1"
|
FEATURES="nesting=1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$ENABLE_FUSE" == "1" ]; then
|
|
||||||
FEATURES="$FEATURES,fuse=1"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$ENABLE_TUN" == "1" ]; then
|
|
||||||
cat <<EOF >>"$LXC_CONFIG"
|
|
||||||
lxc.cgroup2.devices.allow: c 10:200 rwm
|
|
||||||
lxc.mount.entry: /dev/net/tun dev/net/tun none bind,create=file
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ $DIAGNOSTICS == "yes" ]]; then
|
if [[ $DIAGNOSTICS == "yes" ]]; then
|
||||||
post_to_api
|
post_to_api
|
||||||
fi
|
fi
|
||||||
@ -997,8 +982,6 @@ EOF
|
|||||||
export SSH_AUTHORIZED_KEY
|
export SSH_AUTHORIZED_KEY
|
||||||
export CTID="$CT_ID"
|
export CTID="$CT_ID"
|
||||||
export CTTYPE="$CT_TYPE"
|
export CTTYPE="$CT_TYPE"
|
||||||
export ENABLE_FUSE="$ENABLE_FUSE"
|
|
||||||
export ENABLE_TUN="$ENABLE_TUN"
|
|
||||||
export PCT_OSTYPE="$var_os"
|
export PCT_OSTYPE="$var_os"
|
||||||
export PCT_OSVERSION="$var_version"
|
export PCT_OSVERSION="$var_version"
|
||||||
export PCT_DISK_SIZE="$DISK_SIZE"
|
export PCT_DISK_SIZE="$DISK_SIZE"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user