From: Oguz Bektas <o.bektas@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 container 2/2] clear /etc/machine-id also after container clone
Date: Wed, 26 May 2021 16:18:40 +0200 [thread overview]
Message-ID: <20210526141840.1450325-3-o.bektas@proxmox.com> (raw)
In-Reply-To: <20210526141840.1450325-1-o.bektas@proxmox.com>
pass $clone=1 to avoid removing the file. instead we truncate it to an
empty file
Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
---
src/PVE/API2/LXC.pm | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index a9ea3a6..413f466 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -1594,7 +1594,24 @@ __PACKAGE__->register_method({
};
PVE::Firewall::clone_vmfw_conf($vmid, $newid);
- return $rpcenv->fork_worker('vzclone', $vmid, $authuser, $realcmd);
+
+ my $task = eval {
+ return $rpcenv->fork_worker('vzclone', $vmid, $authuser, $realcmd);
+ };
+ if (my $err = $@) {
+ warn $@ if $@;
+ die $err;
+ }
+
+ my $lastconf = PVE::LXC::Config->load_config($newid);
+ my $rootdir = PVE::LXC::mount_all($newid, $storecfg, $lastconf, 1);
+ my $lxc_setup = PVE::LXC::Setup->new($lastconf, $rootdir);
+ $lxc_setup->clear_machine_id($lastconf, 1);
+ PVE::LXC::umount_all($newid, $storecfg, $lastconf, 1);
+
+ return $task;
+
+
}});
--
2.20.1
next prev parent reply other threads:[~2021-05-26 14:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-26 14:18 [pve-devel] SPAM: [PATCH v2 container 0/2] fix #3443: unique machine-id for containers Oguz Bektas
2021-05-26 14:18 ` [pve-devel] [PATCH container 1/2] setup: clear /etc/machine-id for newly created containers Oguz Bektas
2021-05-26 14:18 ` Oguz Bektas [this message]
2021-05-27 5:37 ` [pve-devel] [PATCH v2 container 2/2] clear /etc/machine-id also after container clone Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210526141840.1450325-3-o.bektas@proxmox.com \
--to=o.bektas@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox