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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 7BE9C93643 for ; Mon, 20 Feb 2023 12:13:53 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 64EFF25F64 for ; Mon, 20 Feb 2023 12:13:53 +0100 (CET) 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 ; Mon, 20 Feb 2023 12:13:49 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3F1D647CD8 for ; Mon, 20 Feb 2023 12:13:49 +0100 (CET) Date: Mon, 20 Feb 2023 12:13:47 +0100 From: Christoph Heiss To: Wolfgang Bumiller Cc: pve-devel@lists.proxmox.com Message-ID: <20230220111347.7xhb7f5n2lc7zkeo@maui.proxmox.com> References: <20230215140245.496507-1-c.heiss@proxmox.com> <20230215140245.496507-2-c.heiss@proxmox.com> <20230217142239.p5mptzcibs3pv5te@fwblub> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230217142239.p5mptzcibs3pv5te@fwblub> X-SPAM-LEVEL: Spam detection results: 0 AWL -0.117 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 Subject: Re: [pve-devel] [PATCH v2 container 1/4] lxc: Fix some trailing whitespace 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: Mon, 20 Feb 2023 11:13:53 -0000 On Fri, Feb 17, 2023 at 03:22:39PM +0100, Wolfgang Bumiller wrote: > Does not apply, somewhere along the line you're stripping the trailing > newlines of these patches, how did you generate them? Normally with `git format-patch`, but I think I know where they got "lost". I will take better care before sending the next version and try to apply the series myself before sending! Sorry for that. > > On Wed, Feb 15, 2023 at 03:02:42PM +0100, Christoph Heiss wrote: > > No functional changes. > > > > Signed-off-by: Christoph Heiss > > --- > > Changes v1 -> v2: > > * New patch, split out from patch 2 > > > > src/PVE/LXC.pm | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm > > index ce6d5a5..345e343 100644 > > --- a/src/PVE/LXC.pm > > +++ b/src/PVE/LXC.pm > > @@ -668,7 +668,7 @@ sub update_lxc_config { > > > > # some init scripts expect a linux terminal (turnkey). > > $raw .= "lxc.environment = TERM=linux\n"; > > - > > + > > my $utsname = $conf->{hostname} || "CT$vmid"; > > $raw .= "lxc.uts.name = $utsname\n"; > > > > @@ -1703,14 +1703,14 @@ sub __mountpoint_mount { > > my $type = $mountpoint->{type}; > > my $quota = !$snapname && !$mountpoint->{ro} && $mountpoint->{quota}; > > my $mounted_dev; > > - > > + > > return if !$volid || !$mount; > > > > $mount =~ s!/+!/!g; > > > > my $mount_path; > > my ($mpfd, $parentfd, $last_dir); > > - > > + > > if (defined($rootdir)) { > > ($rootdir, $mount_path, $mpfd, $parentfd, $last_dir) = > > __mount_prepare_rootdir($rootdir, $mount, $rootuid, $rootgid); > > @@ -1719,7 +1719,7 @@ sub __mountpoint_mount { > > if (defined($stage_mount)) { > > $mount_path = $rootdir; > > } > > - > > + > > my ($storage, $volname) = PVE::Storage::parse_volume_id($volid, 1); > > > > die "unknown snapshot path for '$volid'" if !$storage && defined($snapname); > > @@ -1828,7 +1828,7 @@ sub __mountpoint_mount { > > warn "cannot enable quota control for bind mounts\n" if $quota; > > return wantarray ? ($volid, 0, undef) : $volid; > > } > > - > > + > > die "unsupported storage"; > > } > > > > -- > > 2.39.1