Rename vsock config settings

Let's use the same names used by systemd.

diff --git a/mkosi/config.py b/mkosi/config.py
index 4b9cc146be76393bc61c200ed6a123b3b9d04985..d33cc81c7cd5f8154270637a188f49548a05d7fe 100644 (file)
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -3589,6 +3589,7 @@ SETTINGS: list[ConfigSetting[Any]] = [
     ),
     ConfigSetting(
         dest="vsock",
+        name="VSock",
         metavar="FEATURE",
         nargs="?",
         section="Runtime",
@@ -3599,7 +3600,7 @@ SETTINGS: list[ConfigSetting[Any]] = [
     ),
     ConfigSetting(
         dest="vsock_cid",
-        name="VsockConnectionId",
+        name="VSockCID",
         long="--vsock-cid",
         metavar="NUMBER|auto|hash",
         section="Runtime",

diff --git a/tests/test_json.py b/tests/test_json.py
index f6a8094fd84d23c6ffb758fe23d3eeb1584ea9dd..12e9633fa9d0d46ddcc52af29d3b4f3e301960f3 100644 (file)
--- a/tests/test_json.py
+++ b/tests/test_json.py
@@ -384,6 +384,8 @@ def test_config() -> None:
                 "PROPERTY=VALUE"
             ],
             "UseSubvolumes": "auto",
+            "VSock": "enabled",
+            "VSockCID": -2,
             "Verity": "enabled",
             "VerityCertificate": "/path/to/cert",
             "VerityCertificateSource": {
@@ -402,8 +404,6 @@ def test_config() -> None:
             "VolatilePackages": [
                 "abc"
             ],
-            "Vsock": "enabled",
-            "VsockConnectionId": -2,
             "WithDocs": true,
             "WithNetwork": false,
             "WithRecommends": true,