From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 6955E1FF187 for ; Tue, 18 Nov 2025 23:01:49 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7134B1EB5B; Tue, 18 Nov 2025 23:01:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lchholdings-org.20230601.gappssmtp.com; s=20230601; t=1763503286; x=1764108086; darn=lists.proxmox.com; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2nFEvGM7qSCDKGThalrR6W9zzPCJRohaV49WaRYFGas=; b=vz2P98wzSXlwP0UfQ8m9/khQu5GnP8xzard0UZvvubu/csyjqXBZhfjQ34KAEbuiai 3ItSgsNprTg0HxYUS52XqFxdKVzEFtRDAmUwiX1dE0lup3BOUPySPEzqDH6lbNZS444C WWT2uddIbb2hI68s6kbSpRO0QZgiPqgBz11OnHWXMgcl9fAuqeVI3eRvOa3m9Qd7xzWP y4gSxvO5rkAeZ5w/h8ePd3xRg5cl71IUotpBfvFMwRu3sDAzTEeuUxilk3Q0buR6x09P gD3PnurxDAtGQO0ATv6vStH1RLUfRxNvnyv/HXvbx8iH3/7FnZOov3h5QJohUecTjAMs ugUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763503286; x=1764108086; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2nFEvGM7qSCDKGThalrR6W9zzPCJRohaV49WaRYFGas=; b=lW9ZjbvfuvDVV05zJnKCB5pDgGzl5D1mXP8mkURnNripKl+4wr7zcXfo6aJJuKGclY p1ng1GE2d7CW5C29cdhtKXtuQWdxJCX2C4E4t9s0Vo8NvqI8yi9JJH9XK9ii0uy8Zd6N Sbl9o5xi0Sw9QhcmzsFrzxmx2u7vQCnu02B4ffuA0Uod768c1g4dm5yWAFg+vrxPEAH2 s+32tsWVN8zQ7O9fLbx6Ix3Vt7L6RlyMelgJ7xyTAl8ELnSMPjOywIZUGEdh4VBeW24Y 1ppNtzZWn9vgCW1PQxN+n57UMxYOcH7Ivh3tdXQvg8HeMyz8PHhtWQ9xwxWlUb+Hd/4Z LqbA== X-Gm-Message-State: AOJu0YwdwRykm2no6B9vg8/o7Y26resg0ICvtCSStSzEFZtT5HiiefGi qFs7wzByS+L16tEXkgZtX2nH4/EVQdky71lY0YKXM1usxrguwGzBfl/ugqcoB5iWvxe5e6SHa/4 AAwuphB6xoneZlbQ7pEKx+jHMB4u7h6fD/loPYGbfuPKV+Iqziq8Zt3SyrIAm0ykyUJFmKJsRCV 0+7Qg9i+zsGCFJh4RRXs1stYq8Yxrvf1v/xJ3PmnlkSMQq+VOZuVHmJ0ovJrE2hQmPNRFKpTYYR arcsW36Gtj9 X-Gm-Gg: ASbGncuYI1t9Je2EOvYHD+sOJVFk/nseCjImQOfZMa/NjlVFjtXAF5FGKK+6mHM+cMf DRAayOVB3Bls5wdzGKHyt1yi5pD4+aNnoCeyfrzXRrea0cKRAmSm/tZO44BJGQluNVHfLq4rKJ8 VPBVj0l13H5eXq4xyUjKFvKBSD7Xkazu6dIp091SpYzCe5N5wt31E5frvBSlzLefWjkkaW63HvR H72rj0XvKbfAvbsPWJKflf1829wa+OPKnJmLAwhOm1n/tjL8SrpA7cRO3pSzkhQ3reoAQeCDyKY 1Iled3Zfss1TCYJQ0pNH++YJsbtiQSepqyywj0aX2O9UdNhsX+qZ9KuJOFws+IFkKu34qeVFFjC hwsDdX7yPtGZZI2DpV7dwTsTkRf112laEkG4XBUmrhtnPI7YjZtKJBKNnCrwBqKgkYbUKHdEAyQ == X-Google-Smtp-Source: AGHT+IFttqO0Ihc7xAoFM0YrEFlTW9H9YRSXwcCwB0QluYrC7C6AYcLoJuSrLRnQcH1T6Zua9k73U4ydNfJA X-Received: by 2002:a05:690c:6889:b0:787:ec83:5ce6 with SMTP id 00721157ae682-78a6cde8c15mr4702667b3.61.1763503286443; Tue, 18 Nov 2025 14:01:26 -0800 (PST) X-Relaying-Domain: lukeh990.io From: Luke Harding To: pve-devel@lists.proxmox.com Date: Tue, 18 Nov 2025 17:01:16 -0500 Message-ID: <20251118220122.61257-2-luke@lukeh990.io> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251118220122.61257-1-luke@lukeh990.io> References: <20251118220122.61257-1-luke@lukeh990.io> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DMARC_MISSING 0.1 Missing DMARC policy RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH dab 1/7] Add a '--no-ssh' option to dab bootstrap to disable ssh packages that are automatically included. X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Cc: Luke Harding Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Luke Harding --- PVE/DAB.pm | 9 +++++++++ dab | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/PVE/DAB.pm b/PVE/DAB.pm index 59397f2..eb77aa1 100644 --- a/PVE/DAB.pm +++ b/PVE/DAB.pm @@ -1295,6 +1295,15 @@ sub bootstrap { my $add_systemd_sysv_as_required = $suiteinfo->{systemd}; push @$required, 'systemd-sysv' if $add_systemd_sysv_as_required; + if ($opts->{'no-ssh'}) { + my %remove = ( + 'ssh' => 1, + 'openssh-server' => 1, + ); + + @{ $important } = grep { !$remove{$_} } @{ $important }; + } + my $mta = $opts->{exim} ? 'exim' : 'postfix'; if ($mta eq 'postfix') { push @$important, "postfix"; diff --git a/dab b/dab index c01c513..3a4c017 100755 --- a/dab +++ b/dab @@ -11,7 +11,7 @@ $ENV{'LC_ALL'} = 'C'; my $commands = { 'init' => '', - 'bootstrap' => '[--exim] [--include ] --exclude [] [--minimal] [--device-skelleton]', + 'bootstrap' => '[--exim] [--include ] --exclude [] [--minimal] [--device-skelleton] [--no-ssh]', 'finalize' => '[--keepmycnf] [--compressor ]', 'veid' => '', 'basedir' => '', @@ -84,7 +84,7 @@ eval { } elsif ($cmd eq 'bootstrap') { my $opts = {}; - if (!GetOptions ($opts, 'exim', 'minimal', 'device-skelleton', 'include=s', 'exclude=s')) { + if (!GetOptions ($opts, 'exim', 'minimal', 'device-skelleton', 'include=s', 'exclude=s', 'no-ssh')) { fatal_usage(); } die "command 'bootstrap' expects no arguments.\n" if scalar (@ARGV) != 0; -- 2.52.0 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel