From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <w.bumiller@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 11FDB70662
for <pve-devel@lists.proxmox.com>; Fri, 22 Jul 2022 14:27:18 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 0483A32EC
for <pve-devel@lists.proxmox.com>; Fri, 22 Jul 2022 14:26:48 +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
for <pve-devel@lists.proxmox.com>; Fri, 22 Jul 2022 14:26:47 +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 56513438FB
for <pve-devel@lists.proxmox.com>; Fri, 22 Jul 2022 14:26:47 +0200 (CEST)
Date: Fri, 22 Jul 2022 14:26:46 +0200
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Stefan Hrdlicka <s.hrdlicka@proxmox.com>
Cc: pve-devel@lists.proxmox.com
Message-ID: <20220722122646.wxeatrmysemudtei@wobu-vie.proxmox.com>
References: <20220720144949.1568323-1-s.hrdlicka@proxmox.com>
<20220720144949.1568323-3-s.hrdlicka@proxmox.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220720144949.1568323-3-s.hrdlicka@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.277 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 pve-container 2/3] fix #3711 cleanup: remove
spaces from empty lines
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: Fri, 22 Jul 2022 12:27:18 -0000
nit: the subject shouldn't have the `fix #3711` included as this patch
is not directly affecting it ;-)
On Wed, Jul 20, 2022 at 04:49:48PM +0200, Stefan Hrdlicka wrote:
> remove spaces where they are not needed
>
> Signed-off-by: Stefan Hrdlicka <s.hrdlicka@proxmox.com>
> ---
> 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 74c8d17..42d94ac 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";
>
> @@ -1695,14 +1695,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);
> @@ -1711,7 +1711,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);
> @@ -1820,7 +1820,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.30.2