Ping? Patch should still apply

On 11/26/21 16:02, Aaron Lauterer wrote:
Ensure that the user provided $secret ends in a newline. Otherwise we
will have Input/output errors from rados_connect.

Signed-off-by: Aaron Lauterer <[email protected]>
---
  PVE/CephConfig.pm | 1 +
  1 file changed, 1 insertion(+)

diff --git a/PVE/CephConfig.pm b/PVE/CephConfig.pm
index 5c94a04..ac28e76 100644
--- a/PVE/CephConfig.pm
+++ b/PVE/CephConfig.pm
@@ -227,6 +227,7 @@ sub ceph_create_keyfile {
        eval {
            if (defined($secret)) {
                mkdir '/etc/pve/priv/ceph';
+               $secret = "${secret}\n" if $secret !~ m/\n$/;
                PVE::Tools::file_set_contents($ceph_storage_keyring, $secret, 
0400);
            } elsif ($type eq 'rbd') {
                mkdir '/etc/pve/priv/ceph';


_______________________________________________
pve-devel mailing list
[email protected]
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Reply via email to