nick
/
Proxmox_Scripts
mirror of https://github.com/tteck/Proxmox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Leave keyctl off by default as recommended

This commit is contained in:
Rémi Bédard-Couture 2024-03-07 22:21:03 -05:00
parent b12a98e5a3
commit 3e90209df6
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/all-templates.sh
View File

@ -77,8 +77,10 @@ TEMPLATE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "All Templat
NAME=$(echo "$TEMPLATE" | grep -oE '^[^-]+-[^-]+') NAME=$(echo "$TEMPLATE" | grep -oE '^[^-]+-[^-]+')
PASS="$(openssl rand -base64 8)" PASS="$(openssl rand -base64 8)"
CTID=$(pvesh get /cluster/nextid) CTID=$(pvesh get /cluster/nextid)
#Recommended default for unprivileged containers is to leave keyctl off
#https://forum.proxmox.com/threads/how-does-keyctl-works-in-virtual-environments.116414/
PCT_OPTIONS=" PCT_OPTIONS="
-features keyctl=1,nesting=1 -features nesting=1
-hostname $NAME -hostname $NAME
-tags proxmox-helper-scripts -tags proxmox-helper-scripts
-onboot 0 -onboot 0

13
misc/build.func
View File

@ -509,11 +509,14 @@ start() {
build_container() { build_container() {
# if [ "$VERB" == "yes" ]; then set -x; fi # if [ "$VERB" == "yes" ]; then set -x; fi
if [ "$CT_TYPE" == "1" ]; then #Recommended default for unprivileged containers is to leave keyctl off
FEATURES="keyctl=1,nesting=1" #https://forum.proxmox.com/threads/how-does-keyctl-works-in-virtual-environments.116414/
else FEATURES="nesting=1"
FEATURES="nesting=1" # if [ "$CT_TYPE" == "1" ]; then
fi # FEATURES="keyctl=1,nesting=1"
# else
# FEATURES="nesting=1"
# fi
TEMP_DIR=$(mktemp -d) TEMP_DIR=$(mktemp -d)

4
turnkey/turnkey.sh
View File

@ -98,8 +98,10 @@ turnkey=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "TurnKey LXCs
# Setup script environment # Setup script environment
PASS="$(openssl rand -base64 8)" PASS="$(openssl rand -base64 8)"
CTID=$(pvesh get /cluster/nextid) CTID=$(pvesh get /cluster/nextid)
#Recommended default for unprivileged containers is to leave keyctl off
#https://forum.proxmox.com/threads/how-does-keyctl-works-in-virtual-environments.116414/
PCT_OPTIONS=" PCT_OPTIONS="
-features keyctl=1,nesting=1 -features nesting=1
-hostname turnkey-${turnkey} -hostname turnkey-${turnkey}
-tags proxmox-helper-scripts -tags proxmox-helper-scripts
-onboot 1 -onboot 1