Get Features & Fixes from Upstream
This commit is contained in:
CanbiZ
parent
dcfb8d34f2
commit
37fdd4779b
124
misc/build.func
124
misc/build.func
@ -311,7 +311,10 @@ update_motd_ip() {
|
||||
# - Falls back to warning if no keys provided
|
||||
# ------------------------------------------------------------------------------
|
||||
install_ssh_keys_into_ct() {
|
||||
[[ "$SSH" != "yes" ]] && return 0
|
||||
[[ "${SSH:-no}" != "yes" ]] && return 0
|
||||
|
||||
# Ensure SSH_KEYS_FILE is defined (may not be set if advanced_settings was skipped)
|
||||
: "${SSH_KEYS_FILE:=}"
|
||||
|
||||
if [[ -n "$SSH_KEYS_FILE" && -s "$SSH_KEYS_FILE" ]]; then
|
||||
msg_info "Installing selected SSH keys into CT ${CTID}"
|
||||
@ -394,6 +397,90 @@ find_host_ssh_keys() {
|
||||
)
|
||||
}
|
||||
|
||||
# ==============================================================================
|
||||
# SECTION 3B: IP RANGE SCANNING
|
||||
# ==============================================================================
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# ip_to_int() / int_to_ip()
|
||||
#
|
||||
# - Converts IP address to integer and vice versa for range iteration
|
||||
# ------------------------------------------------------------------------------
|
||||
ip_to_int() {
|
||||
local IFS=.
|
||||
read -r i1 i2 i3 i4 <<<"$1"
|
||||
echo $(((i1 << 24) + (i2 << 16) + (i3 << 8) + i4))
|
||||
}
|
||||
|
||||
int_to_ip() {
|
||||
local ip=$1
|
||||
echo "$(((ip >> 24) & 0xFF)).$(((ip >> 16) & 0xFF)).$(((ip >> 8) & 0xFF)).$((ip & 0xFF))"
|
||||
}
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# resolve_ip_from_range()
|
||||
#
|
||||
# - Takes an IP range in format "10.0.0.1/24-10.0.0.10/24"
|
||||
# - Pings each IP in the range to find the first available one
|
||||
# - Returns the first free IP with CIDR notation
|
||||
# - Sets NET_RESOLVED to the resolved IP or empty on failure
|
||||
# ------------------------------------------------------------------------------
|
||||
resolve_ip_from_range() {
|
||||
local range="$1"
|
||||
local ip_cidr_regex='^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})/([0-9]{1,2})$'
|
||||
local ip_start ip_end
|
||||
|
||||
# Parse range: "10.0.0.1/24-10.0.0.10/24"
|
||||
ip_start="${range%%-*}"
|
||||
ip_end="${range##*-}"
|
||||
|
||||
if [[ ! "$ip_start" =~ $ip_cidr_regex ]] || [[ ! "$ip_end" =~ $ip_cidr_regex ]]; then
|
||||
NET_RESOLVED=""
|
||||
return 1
|
||||
fi
|
||||
|
||||
local ip1="${ip_start%%/*}"
|
||||
local ip2="${ip_end%%/*}"
|
||||
local cidr="${ip_start##*/}"
|
||||
|
||||
local start_int=$(ip_to_int "$ip1")
|
||||
local end_int=$(ip_to_int "$ip2")
|
||||
|
||||
for ((ip_int = start_int; ip_int <= end_int; ip_int++)); do
|
||||
local ip=$(int_to_ip $ip_int)
|
||||
msg_info "Checking IP: $ip"
|
||||
if ! ping -c 1 -W 1 "$ip" >/dev/null 2>&1; then
|
||||
NET_RESOLVED="$ip/$cidr"
|
||||
msg_ok "Found free IP: ${BGN}$NET_RESOLVED${CL}"
|
||||
return 0
|
||||
fi
|
||||
done
|
||||
|
||||
NET_RESOLVED=""
|
||||
msg_error "No free IP found in range $range"
|
||||
return 1
|
||||
}
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# is_ip_range()
|
||||
#
|
||||
# - Checks if a string is an IP range (contains - and looks like IP/CIDR)
|
||||
# - Returns 0 if it's a range, 1 otherwise
|
||||
# ------------------------------------------------------------------------------
|
||||
is_ip_range() {
|
||||
local value="$1"
|
||||
local ip_start ip_end
|
||||
if [[ "$value" == *-* ]] && [[ "$value" != "dhcp" ]]; then
|
||||
local ip_cidr_regex='^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})/([0-9]{1,2})$'
|
||||
ip_start="${value%%-*}"
|
||||
ip_end="${value##*-}"
|
||||
if [[ "$ip_start" =~ $ip_cidr_regex ]] && [[ "$ip_end" =~ $ip_cidr_regex ]]; then
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
# ==============================================================================
|
||||
# SECTION 4: STORAGE & RESOURCE MANAGEMENT
|
||||
# ==============================================================================
|
||||
@ -506,6 +593,18 @@ base_settings() {
|
||||
HN=${var_hostname:-$NSAPP}
|
||||
BRG=${var_brg:-"vmbr0"}
|
||||
NET=${var_net:-"dhcp"}
|
||||
|
||||
# Resolve IP range if NET contains a range (e.g., 192.168.1.100/24-192.168.1.200/24)
|
||||
if is_ip_range "$NET"; then
|
||||
msg_info "Scanning IP range: $NET"
|
||||
if resolve_ip_from_range "$NET"; then
|
||||
NET="$NET_RESOLVED"
|
||||
else
|
||||
msg_error "Could not find free IP in range. Falling back to DHCP."
|
||||
NET="dhcp"
|
||||
fi
|
||||
fi
|
||||
|
||||
IPV6_METHOD=${var_ipv6_method:-"none"}
|
||||
IPV6_STATIC=${var_ipv6_static:-""}
|
||||
GATE=${var_gateway:-""}
|
||||
@ -535,9 +634,16 @@ base_settings() {
|
||||
TAGS="community-script,${var_tags:-}"
|
||||
ENABLE_FUSE=${var_fuse:-"${1:-no}"}
|
||||
ENABLE_TUN=${var_tun:-"${1:-no}"}
|
||||
ENABLE_KEYCTL=${var_keyctl:-0}
|
||||
ENABLE_MKNOD=${var_mknod:-0}
|
||||
|
||||
# Additional settings that may be skipped if advanced_settings is not run (e.g., App Defaults)
|
||||
ENABLE_GPU=${var_gpu:-"no"}
|
||||
ENABLE_NESTING=${var_nesting:-"1"}
|
||||
ENABLE_KEYCTL=${var_keyctl:-"0"}
|
||||
ENABLE_MKNOD=${var_mknod:-"0"}
|
||||
MOUNT_FS=${var_mount_fs:-""}
|
||||
PROTECT_CT=${var_protection:-"no"}
|
||||
CT_TIMEZONE=${var_timezone:-"$timezone"}
|
||||
[[ "${CT_TIMEZONE:-}" == Etc/* ]] && CT_TIMEZONE="host" # pct doesn't accept Etc/* zones
|
||||
|
||||
# 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
|
||||
@ -696,12 +802,12 @@ var_fuse=no
|
||||
var_tun=no
|
||||
|
||||
# Advanced Settings (Proxmox-official features)
|
||||
var_nesting=1
|
||||
var_keyctl=0
|
||||
var_mknod=0
|
||||
var_mount_fs=""
|
||||
var_protection=no
|
||||
var_timezone=""
|
||||
var_nesting=1 # Allow nesting (required for Docker/LXC in CT)
|
||||
var_keyctl=0 # Allow keyctl() - needed for Docker (systemd-networkd workaround)
|
||||
var_mknod=0 # Allow device node creation (requires kernel 5.3+, experimental)
|
||||
var_mount_fs= # Allow specific filesystems: nfs,fuse,ext4,etc (leave empty for defaults)
|
||||
var_protection=no # Prevent accidental deletion of container
|
||||
var_timezone= # Container timezone (e.g. Europe/Berlin, leave empty for host timezone)
|
||||
var_tags=community-script
|
||||
var_verbose=no
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user