From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9AEB77141C for ; Thu, 10 Jun 2021 13:47:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8FB742E92D for ; Thu, 10 Jun 2021 13:47:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 8695C2E917 for ; Thu, 10 Jun 2021 13:47:30 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 57BA4465F9 for ; Thu, 10 Jun 2021 13:47:30 +0200 (CEST) Date: Thu, 10 Jun 2021 13:47:23 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20210527092601.148400-1-o.bektas@proxmox.com> <20210527092601.148400-2-o.bektas@proxmox.com> In-Reply-To: <20210527092601.148400-2-o.bektas@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1623325310.d7m8o7zpwa.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.920 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches 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, proxmox.com, setup.pm] Subject: Re: [pve-devel] [PATCH v3 container 1/2] setup: clear /etc/machine-id for newly created containers 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: , X-List-Received-Date: Thu, 10 Jun 2021 11:47:31 -0000 On May 27, 2021 11:26 am, Oguz Bektas wrote: > this way when new containers are created they will have a unique > /etc/machine-id >=20 > Signed-off-by: Oguz Bektas > --- > v3: > no changes >=20 >=20 > src/PVE/LXC/Setup.pm | 10 ++++++++++ > src/PVE/LXC/Setup/Base.pm | 25 +++++++++++++++++++++++++ > 2 files changed, 35 insertions(+) >=20 > diff --git a/src/PVE/LXC/Setup.pm b/src/PVE/LXC/Setup.pm > index 8b8fee9..c31a164 100644 > --- a/src/PVE/LXC/Setup.pm > +++ b/src/PVE/LXC/Setup.pm > @@ -352,6 +352,16 @@ sub pre_start_hook { > $self->protected_call($code); > } > =20 > +sub clear_machine_id { > + my ($self, $conf, $clone) =3D @_; > + > + my $code =3D sub { > + $self->{plugin}->clear_machine_id($self->{conf}, $clone); > + }; > + $self->protected_call($code); > + > +} maybe it would make more sense to call this "post_clone_hook", so it is=20 re-usable for other, similar changes (like optionally regenerating SSH=20 keys, or ...) in the future without polluting the entry-point namespace=20 too much? > + > sub post_create_hook { > my ($self, $root_password, $ssh_keys) =3D @_; > =20 > diff --git a/src/PVE/LXC/Setup/Base.pm b/src/PVE/LXC/Setup/Base.pm > index d73335b..21074b7 100644 > --- a/src/PVE/LXC/Setup/Base.pm > +++ b/src/PVE/LXC/Setup/Base.pm > @@ -476,6 +476,30 @@ sub set_timezone { > } > } > =20 > +sub clear_machine_id { > + my ($self, $conf, $clone) =3D @_; > + > + my $uses_systemd =3D $self->ct_is_executable("/lib/systemd/systemd") > + || $self->ct_is_executable("/usr/lib/systemd/systemd"); > + > + my $dbus_machine_id_path =3D "/var/lib/dbus/machine-id"; > + my $machine_id_path =3D "/etc/machine-id"; > + if ( > + $self->ct_file_exists($dbus_machine_id_path) > + && !$self->ct_is_symlink($dbus_machine_id_path) > + && $uses_systemd > + ) { > + $self->ct_unlink($dbus_machine_id_path); > + } > + > + # don't remove file if container is being cloned > + if ($clone) { > + $self->ct_file_set_contents($machine_id_path, "\n"); > + } else { > + $self->ct_unlink($machine_id_path); > + } > +} > + > sub pre_start_hook { > my ($self, $conf) =3D @_; > =20 > @@ -491,6 +515,7 @@ sub pre_start_hook { > sub post_create_hook { > my ($self, $conf, $root_password, $ssh_keys) =3D @_; > =20 > + $self->clear_machine_id($conf); > $self->template_fixup($conf); > =20 > &$randomize_crontab($self, $conf); > --=20 > 2.20.1 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20