From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Stefan Hrdlicka <s.hrdlicka@proxmox.com>
Cc: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH pve-container 2/3] fix #3711 cleanup: remove spaces from empty lines
Date: Fri, 22 Jul 2022 14:26:46 +0200 [thread overview]
Message-ID: <20220722122646.wxeatrmysemudtei@wobu-vie.proxmox.com> (raw)
In-Reply-To: <20220720144949.1568323-3-s.hrdlicka@proxmox.com>
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
next prev parent reply other threads:[~2022-07-22 12:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-20 14:49 [pve-devel] [PATCH pve-container 0/3] fix #3711: delete LXC container with missing storage Stefan Hrdlicka
2022-07-20 14:49 ` [pve-devel] [PATCH pve-container 1/3] fix #3711: enable delete of LXC container via force option Stefan Hrdlicka
2022-07-22 12:25 ` Wolfgang Bumiller
2022-07-20 14:49 ` [pve-devel] [PATCH pve-container 2/3] fix #3711 cleanup: remove spaces from empty lines Stefan Hrdlicka
2022-07-22 12:26 ` Wolfgang Bumiller [this message]
2022-07-20 14:49 ` [pve-devel] [PATCH pve-manager 3/3] fix #3711: enable removing container with non existent storage Stefan Hrdlicka
2022-07-25 10:40 ` [pve-devel] [PATCH pve-container 0/3] fix #3711: delete LXC container with missing storage Fiona Ebner
2022-07-25 13:31 ` Wolfgang Bumiller
2022-08-05 12:05 ` Stefan Hrdlicka
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=20220722122646.wxeatrmysemudtei@wobu-vie.proxmox.com \
--to=w.bumiller@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
--cc=s.hrdlicka@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