From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id A4DCC1FF187 for ; Tue, 18 Nov 2025 23:02:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 349E01EDA2; Tue, 18 Nov 2025 23:01:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lchholdings-org.20230601.gappssmtp.com; s=20230601; t=1763503290; x=1764108090; 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=SWE4GqGnxOU1TCgEX8Cv3glq8/fA8qhRU20o+GPkNPU=; b=TIGzUSql8CWAM/x6FFhbtrQRCW1ir3kXXsAV30u0fP3EAEgYqdO+XQVe85Aj0DKFPc NdQLtvbiYzqD3Y1wANZRe5BJkRws55QSNmdFE2rhozjB9zBXVcPsHeeorOzhfIrTUclj eIt3xHgh30QXFnozmKX92xdrhxMx4R+vSviIYY7kqA80mOzL9I468C9kabLaiEtSqF4d 54/goXJJLZYSUdKawAandFVEPq7r/vRu1CLRBjBw8/9prsNbknOXxYLpCFaxGmBvz1Vr GTvRzm5pwRrRpOj8pDuayjAg71IirModf5+e1yuemZfojOOfsGRTDLFeP44EnuxXCX8F Hy7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763503290; x=1764108090; 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=SWE4GqGnxOU1TCgEX8Cv3glq8/fA8qhRU20o+GPkNPU=; b=bOhOafR7RjoQGesSbBrkCOlIH541+8FV2aEok62NcN+NeZ05t0OlhmhSvAYerbfH+t 7xQZRc4Da+ZF2md7ncLDOo9phuFyQtTKOpJGjs3JLgesXJoV0YGMJXPLQWxPdMIokfjF pKWxDwqaPldB0Ix4lwRn4zLKrrHefa1VOvO95HJS2fpjBS9JNBnLtgFSpwLIgZuWLess 7qYlL9pc6kvGjwNItEtbrKftn82RQCR4W3AgAPJv+37QUs6xljNz2GyKbMT3oZ+fDNbD JLOZ7VWsWMU7RwCRyiTWQCOxpNHLT0q42ZA3zIjV3e9hzjyU7z1Sc1eZDGeEHr0yS2Uf kbqg== X-Gm-Message-State: AOJu0YwkEydIjKd0e20fg0v4rrKPm/0iSW5wzrMDHfRRyMD3A2I11Kx4 0IPqFwVoKNrXEAmb2xl9BSU/K9LueyBz0YpqISBCi7bKZi8zxAt+1jtKiigc/pH2SyIrowTP0Ac HxE+6E2M2Y1L43E0gWChJaDw+XyYV9VMU9saOdPsbKLYhnLI3f7Gec0ZQOjg8IgipERaD+h7BhX 7JPzzUJPMp4PV9rD49VZBuuPaY7lD4C9mLV9OdiidD3z+tQAY5G1HpbN1AHwqFKemvk7zC46e22 wOYkcPVDNgP X-Gm-Gg: ASbGncug1LwoATjjrKctu8VUIDla0JzWuCe4ZrccOXEHYo0XjNMg7M7JVEhPOg3ktAk bn0LTel1UwLtAYJVRhS3DoLQhZE1iUe2RIzqJ+9DyQS1lmcMIn18ci6VtF0m9VOW17OhtQIrPk4 hfgvbar/INmyXJQXx23BhIWF+aOain+JU8Uthb3lX71ozijnHwMv777x4gVOXabLqFtiqZmN2Mx /v+5JaId53GApp9DO+wTs9cQV1wMh7glyV0USKojqe+E7qOZVF+wkeX7Wrzhj0YxlofZs+jFzBl hqkqIyCXWIJ//zXGk4KYBbT/E8H5d5bYSoV7Y3sRJNb5HG+Yi7t5kJQQmJFp7v0vBfIQqEV9PC2 K0M3u1WPzuyD4yHCcRJgixcMHWnAtOStrsm4B8Jtq2CpIDGjWWg3/whEnfo+K/e7cjLmPi1PwHg == X-Google-Smtp-Source: AGHT+IF3FnhhEavBxZXBpY4rqL0m6sLAKrPWJkvmMxm0rfwKXZRVsc6k+VNpVnrakdowQDeUoO0xtZ4Tef9L X-Received: by 2002:a05:690c:6389:b0:77f:9dae:34f0 with SMTP id 00721157ae682-78929f397d5mr144071877b3.46.1763503289898; Tue, 18 Nov 2025 14:01:29 -0800 (PST) X-Relaying-Domain: lukeh990.io From: Luke Harding To: pve-devel@lists.proxmox.com Date: Tue, 18 Nov 2025 17:01:20 -0500 Message-ID: <20251118220122.61257-6-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 5/7] Add new `[--mta ]` flag; Deprecate --exim. 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 | 10 ++++++++-- dab | 6 ++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/PVE/DAB.pm b/PVE/DAB.pm index 8b93c1b..f42b937 100644 --- a/PVE/DAB.pm +++ b/PVE/DAB.pm @@ -1322,9 +1322,15 @@ sub bootstrap { @{ $important } = grep { !$remove{$_} } @{ $important }; } - my $mta = $opts->{exim} ? 'exim' : 'postfix'; + my $mta = $opts->{mta} ? $opts->{mta} : "postfix"; + + # Maintain compatibility with `--exim` flag + if ($opts->{exim}) { + $mta = "exim"; + } + if ($mta eq 'postfix') { - push @$important, "postfix"; + push @$important, "postfix"; } if ($opts->{include}) { diff --git a/dab b/dab index 3a4c017..9a010c0 100755 --- a/dab +++ b/dab @@ -11,7 +11,8 @@ $ENV{'LC_ALL'} = 'C'; my $commands = { 'init' => '', - 'bootstrap' => '[--exim] [--include ] --exclude [] [--minimal] [--device-skelleton] [--no-ssh]', + 'bootstrap' => '[--mta ] [--exim (deprecated)] [--include ]' + . '[--exclude [] [--minimal] [--device-skelleton] [--no-ssh]', 'finalize' => '[--keepmycnf] [--compressor ]', 'veid' => '', 'basedir' => '', @@ -84,7 +85,8 @@ eval { } elsif ($cmd eq 'bootstrap') { my $opts = {}; - if (!GetOptions ($opts, 'exim', 'minimal', 'device-skelleton', 'include=s', 'exclude=s', 'no-ssh')) { + if (!GetOptions ($opts, 'exim', 'minimal', 'device-skelleton', 'include=s', + 'exclude=s', 'no-ssh', 'mta=s')) { 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