[pve-devel] [PATCH v2 container 1/4] lxc: Fix some trailing whitespace

Wolfgang Bumiller w.bumiller at proxmox.com
Fri Feb 17 15:22:39 CET 2023


Does not apply, somewhere along the line you're stripping the trailing
newlines of these patches, how did you generate them?

On Wed, Feb 15, 2023 at 03:02:42PM +0100, Christoph Heiss wrote:
> No functional changes.
> 
> Signed-off-by: Christoph Heiss <c.heiss at proxmox.com>
> ---
> 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





More information about the pve-devel mailing list