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 9F2A190824 for ; Thu, 22 Sep 2022 15:53:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 857DC19E6F for ; Thu, 22 Sep 2022 15:53:22 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 22 Sep 2022 15:53:21 +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 345A54456F for ; Thu, 22 Sep 2022 15:53:21 +0200 (CEST) Date: Thu, 22 Sep 2022 15:53:20 +0200 From: Wolfgang Bumiller To: Stefan Hanreich Cc: pve-devel@lists.proxmox.com Message-ID: <20220922135320.jiowqabga5uwtumg@casey.proxmox.com> References: <20220922131943.4066317-1-s.hanreich@proxmox.com> <20220922131943.4066317-3-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220922131943.4066317-3-s.hanreich@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.263 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. [lxc.pm] Subject: Re: [pve-devel] [PATCH pve-container 1/1] Add pre/post-restore hooks to CTs 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, 22 Sep 2022 13:53:22 -0000 On Thu, Sep 22, 2022 at 03:19:42PM +0200, Stefan Hanreich wrote: > Signed-off-by: Stefan Hanreich > --- > src/PVE/API2/LXC.pm | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm > index 589f96f..3ecf5e5 100644 > --- a/src/PVE/API2/LXC.pm > +++ b/src/PVE/API2/LXC.pm > @@ -376,6 +376,8 @@ __PACKAGE__->register_method({ > eval { > my $orig_mp_param; # only used if $restore > if ($restore) { > + PVE::GuestHelpers::exec_hookscript($old_conf, $vmid, 'pre-restore', 1); > + > die "can't overwrite running container\n" if PVE::LXC::check_running($vmid); I think this check should happen before the hook. > if ($archive ne '-') { > my $orig_conf; > @@ -502,6 +504,10 @@ __PACKAGE__->register_method({ > > PVE::API2::LXC::Status->vm_start({ vmid => $vmid, node => $node }) > if $start_after_create; > + > + if ($restore) { > + PVE::GuestHelpers::exec_hookscript($conf, $vmid, 'post-restore'); > + } > }; > > my $workername = $restore ? 'vzrestore' : 'vzcreate'; > -- > 2.30.2