From e147c848bb1a5ace434d181ba6058f0a762fd275 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Mon, 24 Nov 2025 11:35:48 +0100 Subject: [PATCH] Update install.func --- misc/install.func | 57 +++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 41 deletions(-) diff --git a/misc/install.func b/misc/install.func index 9ea4a0fab..e9e319576 100644 --- a/misc/install.func +++ b/misc/install.func @@ -28,17 +28,6 @@ # SECTION 1: INITIALIZATION # ============================================================================== -# Ensure INSTALL_LOG is set (exported from build.func, but fallback if missing) -if [[ -z "${INSTALL_LOG:-}" ]]; then - INSTALL_LOG="/root/.install-${SESSION_ID:-unknown}.log" -fi - -# Dev mode: Persistent logs directory -if [[ "${DEV_MODE_LOGS:-false}" == "true" ]]; then - mkdir -p /var/log/community-scripts - INSTALL_LOG="/var/log/community-scripts/install-${SESSION_ID:-unknown}-$(date +%Y%m%d_%H%M%S).log" -fi - if ! command -v curl >/dev/null 2>&1; then printf "\r\e[2K%b" '\033[93m Setup Source \033[m' >&2 apt-get update >/dev/null 2>&1 @@ -49,9 +38,6 @@ source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxV load_functions catch_errors -# Re-parse dev_mode in container context (flags exported from host) -parse_dev_mode - # ============================================================================== # SECTION 2: NETWORK & CONNECTIVITY # ============================================================================== @@ -122,23 +108,20 @@ network_check() { # Check IPv4 connectivity to Google, Cloudflare & Quad9 DNS servers. if ping -c 1 -W 1 1.1.1.1 &>/dev/null || ping -c 1 -W 1 8.8.8.8 &>/dev/null || ping -c 1 -W 1 9.9.9.9 &>/dev/null; then + msg_ok "IPv4 Internet Connected" ipv4_connected=true - ipv4_status="${GN}✔${CL} IPv4" else - ipv4_status="${RD}✖${CL} IPv4" + msg_error "IPv4 Internet Not Connected" fi # Check IPv6 connectivity to Google, Cloudflare & Quad9 DNS servers. if ping6 -c 1 -W 1 2606:4700:4700::1111 &>/dev/null || ping6 -c 1 -W 1 2001:4860:4860::8888 &>/dev/null || ping6 -c 1 -W 1 2620:fe::fe &>/dev/null; then + msg_ok "IPv6 Internet Connected" ipv6_connected=true - ipv6_status="${GN}✔${CL} IPv6" else - ipv6_status="${RD}✖${CL} IPv6" + msg_error "IPv6 Internet Not Connected" fi - # Show combined status - msg_ok "Internet: ${ipv4_status} ${ipv6_status}" - # If both IPv4 and IPv6 checks fail, prompt the user if [[ $ipv4_connected == false && $ipv6_connected == false ]]; then read -r -p "No Internet detected, would you like to continue anyway? " prompt @@ -256,6 +239,10 @@ motd_ssh() { fi } +# ============================================================================== +# SECTION 5: CONTAINER CUSTOMIZATION +# ============================================================================== + # ------------------------------------------------------------------------------ # customize() # @@ -266,33 +253,21 @@ motd_ssh() { # - Sets proper permissions on SSH directories and key files # ------------------------------------------------------------------------------ customize() { - if [[ -z "${PASSWORD:-}" ]]; then - msg_info "Configuring autologin for root" - - # Enable root account (remove password lock) - passwd -d root >/dev/null 2>&1 || true - - # Create getty override for container-getty@1.service + if [[ "$PASSWORD" == "" ]]; then + msg_info "Customizing Container" GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf" mkdir -p $(dirname $GETTY_OVERRIDE) cat <$GETTY_OVERRIDE -[Service] -ExecStart= -ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM + [Service] + ExecStart= + ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM EOF - - # Reload and restart getty service - $STD systemctl daemon-reload - $STD systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') || true - - msg_ok "Autologin configured" + systemctl daemon-reload + systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') + msg_ok "Customized Container" fi - - msg_ok "Customized Container" - echo "bash -c \"\$(curl -fsSL https://github.com/community-scripts/ProxmoxVED/raw/main/ct/${app}.sh)\"" >/usr/bin/update chmod +x /usr/bin/update - if [[ -n "${SSH_AUTHORIZED_KEY}" ]]; then mkdir -p /root/.ssh echo "${SSH_AUTHORIZED_KEY}" >/root/.ssh/authorized_keys