From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <oguz@gaia.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id C5B1B724AE
for <pve-devel@lists.proxmox.com>; Tue, 25 May 2021 15:16:40 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id B0C812C4A6
for <pve-devel@lists.proxmox.com>; Tue, 25 May 2021 15:16:10 +0200 (CEST)
Received: from gaia.proxmox.com (unknown [94.136.29.99])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 995232C49B
for <pve-devel@lists.proxmox.com>; Tue, 25 May 2021 15:16:09 +0200 (CEST)
Received: from gaia.proxmox.com (localhost.localdomain [127.0.0.1])
by gaia.proxmox.com (8.15.2/8.15.2/Debian-14~deb10u1) with ESMTP id
14PDG3pU1007376; Tue, 25 May 2021 15:16:03 +0200
Received: (from oguz@localhost)
by gaia.proxmox.com (8.15.2/8.15.2/Submit) id 14PDG34c1007375;
Tue, 25 May 2021 15:16:03 +0200
From: Oguz Bektas <o.bektas@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 25 May 2021 15:15:59 +0200
Message-Id: <20210525131559.1007131-1-o.bektas@proxmox.com>
X-Mailer: git-send-email 2.20.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 2
AWL -0.138 Adjusted score from AWL reputation of From: address
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery
methods
NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records
RDNS_NONE 1.274 Delivered to internal network by a host with no rDNS
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_NONE 0.001 SPF: sender does not publish an SPF Record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [base.pm]
Subject: [pve-devel] [PATCH container] setup: make randomize_crontab a state
subroutine
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 25 May 2021 13:16:40 -0000
for consistency in post_create_hook. still works as expected
Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
---
src/PVE/LXC/Setup/Base.pm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/PVE/LXC/Setup/Base.pm b/src/PVE/LXC/Setup/Base.pm
index d73335b..be41874 100644
--- a/src/PVE/LXC/Setup/Base.pm
+++ b/src/PVE/LXC/Setup/Base.pm
@@ -422,7 +422,7 @@ sub set_user_authorized_ssh_keys {
$self->ct_modify_file("$home/.ssh/authorized_keys", $ssh_keys, perms => 0700);
}
-my $randomize_crontab = sub {
+sub randomize_crontab {
my ($self, $conf) = @_;
my @files;
@@ -450,7 +450,7 @@ my $randomize_crontab = sub {
}
$self->ct_file_set_contents($filename, $new);
}
-};
+}
sub set_timezone {
my ($self, $conf) = @_;
@@ -493,7 +493,7 @@ sub post_create_hook {
$self->template_fixup($conf);
- &$randomize_crontab($self, $conf);
+ $self->randomize_crontab($conf);
$self->set_user_password($conf, 'root', $root_password);
$self->set_user_authorized_ssh_keys($conf, 'root', $ssh_keys) if $ssh_keys;
--
2.20.1