-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
30 changed files
with
606 additions
and
443 deletions.
There are no files selected for viewing
23 changes: 0 additions & 23 deletions
23
lxd/lxd-5.18-Fix-duplicate-used-by-entry-in-storage-pool.patch
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
75 changes: 0 additions & 75 deletions
75
lxd/lxd-5.18-lxd-instance-drivers-Check-running-status-with-InitPID-for-cgroups.patch
This file was deleted.
Oops, something went wrong.
26 changes: 0 additions & 26 deletions
26
...d-5.18-network-Dont-consider-an-IP-parse-failure-of-a-proxy-listen-address-an-error.patch
This file was deleted.
Oops, something went wrong.
27 changes: 0 additions & 27 deletions
27
lxd/lxd-5.18-simplestreams-Fix-regression-in-lxd_combined-tar-gz-handling.patch
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,128 @@ | ||
From 779396a99c7915b3879439b71ff930abdf11f2c0 Mon Sep 17 00:00:00 2001 | ||
From: =?UTF-8?q?Julian=20Peliz=C3=A4us?= <[email protected]> | ||
Date: Wed, 6 Dec 2023 10:32:12 +0100 | ||
Subject: [PATCH] lxd/cluster/config: Add missing description default values | ||
MIME-Version: 1.0 | ||
Content-Type: text/plain; charset=UTF-8 | ||
Content-Transfer-Encoding: 8bit | ||
|
||
Signed-off-by: Julian Pelizäus <[email protected]> | ||
--- | ||
lxd/cluster/config/config.go | 2 ++ | ||
1 file changed, 2 insertions(+) | ||
|
||
diff --git a/lxd/cluster/config/config.go b/lxd/cluster/config/config.go | ||
index 3fd8449f542e..881e964f3fcb 100644 | ||
--- a/lxd/cluster/config/config.go | ||
+++ b/lxd/cluster/config/config.go | ||
@@ -455,6 +455,7 @@ var ConfigSchema = config.Schema{ | ||
// --- | ||
// type: bool | ||
// scope: global | ||
+ // defaultdesc: `false` | ||
// shortdesc: Whether to set `Access-Control-Allow-Credentials` | ||
"core.https_allowed_credentials": {Type: config.Bool, Default: "false"}, | ||
|
||
@@ -523,6 +524,7 @@ var ConfigSchema = config.Schema{ | ||
// --- | ||
// type: bool | ||
// scope: global | ||
+ // defaultdesc: `false` | ||
// shortdesc: Whether to automatically trust clients signed by the CA | ||
"core.trust_ca_certificates": {Type: config.Bool, Default: "false"}, | ||
|
||
From b061ef9a43889e60b315bb6b003452f1f18c7b92 Mon Sep 17 00:00:00 2001 | ||
From: =?UTF-8?q?Julian=20Peliz=C3=A4us?= <[email protected]> | ||
Date: Wed, 6 Dec 2023 10:32:35 +0100 | ||
Subject: [PATCH] lxd/node: Add missing description default values | ||
MIME-Version: 1.0 | ||
Content-Type: text/plain; charset=UTF-8 | ||
Content-Transfer-Encoding: 8bit | ||
|
||
Signed-off-by: Julian Pelizäus <[email protected]> | ||
--- | ||
lxd/node/config.go | 1 + | ||
1 file changed, 1 insertion(+) | ||
|
||
diff --git a/lxd/node/config.go b/lxd/node/config.go | ||
index 767dfa155ebd..95ba1e728a5f 100644 | ||
--- a/lxd/node/config.go | ||
+++ b/lxd/node/config.go | ||
@@ -247,6 +247,7 @@ var ConfigSchema = config.Schema{ | ||
// --- | ||
// type: bool | ||
// scope: local | ||
+ // defaultdesc: `false` | ||
// shortdesc: Whether to enable the syslog unixgram socket listener | ||
"core.syslog_socket": {Validator: validate.Optional(validate.IsBool), Type: config.Bool}, | ||
|
||
From b15fa003059122d57bc3a45b8bf3aaf2ebc2bae9 Mon Sep 17 00:00:00 2001 | ||
From: =?UTF-8?q?Julian=20Peliz=C3=A4us?= <[email protected]> | ||
Date: Wed, 6 Dec 2023 10:32:58 +0100 | ||
Subject: [PATCH] Update metadata | ||
MIME-Version: 1.0 | ||
Content-Type: text/plain; charset=UTF-8 | ||
Content-Transfer-Encoding: 8bit | ||
|
||
Signed-off-by: Julian Pelizäus <[email protected]> | ||
--- | ||
doc/config_options.txt | 3 +++ | ||
lxd/metadata/configuration.json | 3 +++ | ||
2 files changed, 6 insertions(+) | ||
|
||
diff --git a/doc/config_options.txt b/doc/config_options.txt | ||
index 440a5183c956..405feba1341f 100644 | ||
--- a/doc/config_options.txt | ||
+++ b/doc/config_options.txt | ||
@@ -1513,6 +1513,7 @@ See {ref}`server-expose`. | ||
``` | ||
|
||
```{config:option} core.https_allowed_credentials server-core | ||
+:defaultdesc: "`false`" | ||
:scope: "global" | ||
:shortdesc: "Whether to set `Access-Control-Allow-Credentials`" | ||
:type: "bool" | ||
@@ -1609,6 +1610,7 @@ See {ref}`howto-storage-buckets`. | ||
``` | ||
|
||
```{config:option} core.syslog_socket server-core | ||
+:defaultdesc: "`false`" | ||
:scope: "local" | ||
:shortdesc: "Whether to enable the syslog unixgram socket listener" | ||
:type: "bool" | ||
@@ -1616,6 +1618,7 @@ Set this option to `true` to enable the syslog unixgram socket to receive log me | ||
``` | ||
|
||
```{config:option} core.trust_ca_certificates server-core | ||
+:defaultdesc: "`false`" | ||
:scope: "global" | ||
:shortdesc: "Whether to automatically trust clients signed by the CA" | ||
:type: "bool" | ||
diff --git a/lxd/metadata/configuration.json b/lxd/metadata/configuration.json | ||
index b5cb84c457bc..288eaec3e101 100644 | ||
--- a/lxd/metadata/configuration.json | ||
+++ b/lxd/metadata/configuration.json | ||
@@ -1649,6 +1649,7 @@ | ||
}, | ||
{ | ||
"core.https_allowed_credentials": { | ||
+ "defaultdesc": "`false`", | ||
"longdesc": "If enabled, the `Access-Control-Allow-Credentials` HTTP header value is set to `true`.", | ||
"scope": "global", | ||
"shortdesc": "Whether to set `Access-Control-Allow-Credentials`", | ||
@@ -1756,6 +1757,7 @@ | ||
}, | ||
{ | ||
"core.syslog_socket": { | ||
+ "defaultdesc": "`false`", | ||
"longdesc": "Set this option to `true` to enable the syslog unixgram socket to receive log messages from external processes.", | ||
"scope": "local", | ||
"shortdesc": "Whether to enable the syslog unixgram socket listener", | ||
@@ -1764,6 +1766,7 @@ | ||
}, | ||
{ | ||
"core.trust_ca_certificates": { | ||
+ "defaultdesc": "`false`", | ||
"longdesc": "", | ||
"scope": "global", | ||
"shortdesc": "Whether to automatically trust clients signed by the CA", |
32 changes: 32 additions & 0 deletions
32
lxd/lxd-5.19-Fix-missing-etag-when-retrieving-storage-pool.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
From 7e2091edb621363520de7cc95b2521931f528ed5 Mon Sep 17 00:00:00 2001 | ||
From: Din Music <[email protected]> | ||
Date: Fri, 20 Oct 2023 13:48:32 +0200 | ||
Subject: [PATCH] lxd/storage_pools: Fix etag when retrieving storage pool | ||
|
||
Signed-off-by: Din Music <[email protected]> | ||
--- | ||
lxd/storage_pools.go | 4 ++-- | ||
1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/lxd/storage_pools.go b/lxd/storage_pools.go | ||
index a39755e47fd0..8082d3da372d 100644 | ||
--- a/lxd/storage_pools.go | ||
+++ b/lxd/storage_pools.go | ||
@@ -624,7 +624,7 @@ func storagePoolGet(d *Daemon, r *http.Request) response.Response { | ||
poolAPI.Status = pool.LocalStatus() | ||
} | ||
|
||
- etag := []any{pool.Name, pool.Driver, poolAPI.Config} | ||
+ etag := []any{pool.Name(), pool.Driver().Info().Name, pool.Description(), poolAPI.Config} | ||
|
||
return response.SyncResponseETag(true, &poolAPI, etag) | ||
} | ||
@@ -711,7 +711,7 @@ func storagePoolPut(d *Daemon, r *http.Request) response.Response { | ||
} | ||
|
||
// Validate the ETag. | ||
- etag := []any{pool.Name(), pool.Driver().Info().Name, etagConfig} | ||
+ etag := []any{pool.Name(), pool.Driver().Info().Name, pool.Description(), etagConfig} | ||
|
||
err = util.EtagCheck(r, etag) | ||
if err != nil { |
Oops, something went wrong.