fix: backport device mode and system-wide conf

reddevillg · reddevillg · commit 69019be52f39 · 2026-05-15T18:15:17.000+08:00
ca6a44e feat: add device passthru mode c7f3a69 feat: support system-wide runtime configuration Signed-off-by: reddevillg <reddevillg@gmail.com>
diff --git a/api/schema/v1.json b/api/schema/v1.json
@@ -1439,6 +1439,12 @@
             "type": "string"
           }
         },
+        "device_mode": {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/DeviceOption"
+          }
+        },
         "ext_defs": {
           "description": "external extension definitions to extend the component",
           "type": "object",
@@ -1450,6 +1456,12 @@
           }
         }
       }
+    },
+    "DeviceOption": {
+      "description": "device option",
+      "enum": [
+        "passthru"
+      ]
     }
   },
   "type": "object",
@@ -1594,6 +1606,9 @@
     },
     "RuntimeConfigure": {
       "$ref": "#/$defs/RuntimeConfigure"
+    },
+    "DeviceOption": {
+      "$ref": "#/$defs/DeviceOption"
     }
   }
 }
diff --git a/api/schema/v1.yaml b/api/schema/v1.yaml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+# SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
 # SPDX-License-Identifier: LGPL-3.0-or-later
 #
 # NOTE:
@@ -1090,13 +1090,20 @@ $defs:
         type: object
         additionalProperties:
           type: string
+      device_mode:
+        type: array
+        items:
+          $ref: '#/$defs/DeviceOption'
       ext_defs:
         description: external extension definitions to extend the component
         type: object
         additionalProperties:
           type: array
           items:
             $ref: '#/$defs/ExtensionDefine'
+  DeviceOption:
+    description: device option
+    enum: ["passthru"]
 type: object
 properties:
   # NOTE: "properties" is auto generated by referring all types is $defs
diff --git a/apps/ll-cli/src/main.cpp b/apps/ll-cli/src/main.cpp
@@ -32,6 +32,7 @@
 
 #include <algorithm>
 #include <functional>
+#include <map>
 #include <memory>
 #include <string_view>
 #include <thread>
@@ -200,6 +201,13 @@ ll-cli run org.deepin.demo -- bash -x /path/to/bash/script)"));
       ->delimiter(',')
       ->allow_extra_args(false)
       ->group("");
+    const std::map<std::string, linglong::api::types::v1::DeviceOption> deviceOptionMap = {
+        { "passthru", linglong::api::types::v1::DeviceOption::Passthru },
+    };
+    cliRun->add_option("--device-mode", runOptions.deviceOptions, _("Add device options"))
+      ->delimiter(',')
+      ->transform(CLI::CheckedTransformer(deviceOptionMap, CLI::ignore_case))
+      ->allow_extra_args(false);
     cliRun->add_option("COMMAND", runOptions.commands, _("Run commands in a running sandbox"));
 }
 
diff --git a/configure.h.in b/configure.h.in
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+ * SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
@@ -22,8 +22,9 @@
 #define LINGLONG_CLIENT_NAME "@LINGLONG_CLI_BIN@"
 #define LINGLONG_CLIENT_PATH "@CMAKE_INSTALL_FULL_BINDIR@/@LINGLONG_CLI_BIN@"
 #define LINGLONG_EXPORT_PATH "@LINGLONG_EXPORT_PATH@"
+#define LINGLONG_SYSCONFDIR SYSCONFDIR "/linglong"
 // The directory where the package install hooks reside.
-#define LINGLONG_INSTALL_HOOKS_DIR "@CMAKE_INSTALL_FULL_SYSCONFDIR@/linglong/config.d"
+#define LINGLONG_INSTALL_HOOKS_DIR LINGLONG_SYSCONFDIR "/config.d"
 
 #define LINGLONG_EXPORT_VERSION "1.0.0.2"
 // The package's locale domain.
diff --git a/libs/api/src/linglong/api/types/v1/DeviceOption.hpp b/libs/api/src/linglong/api/types/v1/DeviceOption.hpp
@@ -0,0 +1,39 @@
+// This file is generated by tools/codegen.sh
+// DO NOT EDIT IT.
+
+// clang-format off
+
+//  To parse this JSON data, first install
+//
+//      json.hpp  https://github.com/nlohmann/json
+//
+//  Then include this file, and then do
+//
+//     DeviceOption.hpp data = nlohmann::json::parse(jsonString);
+
+#pragma once
+
+#include <optional>
+#include <nlohmann/json.hpp>
+#include "linglong/api/types/v1/helper.hpp"
+
+namespace linglong {
+namespace api {
+namespace types {
+namespace v1 {
+/**
+* device option
+*/
+
+using nlohmann::json;
+
+/**
+* device option
+*/
+enum class DeviceOption : int { Passthru };
+}
+}
+}
+}
+
+// clang-format on
diff --git a/libs/api/src/linglong/api/types/v1/Generators.hpp b/libs/api/src/linglong/api/types/v1/Generators.hpp
@@ -59,6 +59,7 @@
 #include "linglong/api/types/v1/ExportDirs.hpp"
 #include "linglong/api/types/v1/DialogMessage.hpp"
 #include "linglong/api/types/v1/DialogHandShakePayload.hpp"
+#include "linglong/api/types/v1/DeviceOption.hpp"
 #include "linglong/api/types/v1/ContainerProcessStateInfo.hpp"
 #include "linglong/api/types/v1/CommonResult.hpp"
 #include "linglong/api/types/v1/CommonOptions.hpp"
@@ -253,6 +254,9 @@ void to_json(json & j, const UpgradeListResult & x);
 void from_json(const json & j, LinglongAPIV1 & x);
 void to_json(json & j, const LinglongAPIV1 & x);
 
+void from_json(const json & j, DeviceOption & x);
+void to_json(json & j, const DeviceOption & x);
+
 void from_json(const json & j, InteractionMessageType & x);
 void to_json(json & j, const InteractionMessageType & x);
 
@@ -1200,12 +1204,16 @@ j["version"] = x.version;
 }
 
 inline void from_json(const json & j, RuntimeConfigure& x) {
+x.deviceMode = get_stack_optional<std::vector<DeviceOption>>(j, "device_mode");
 x.env = get_stack_optional<std::map<std::string, std::string>>(j, "env");
 x.extDefs = get_stack_optional<std::map<std::string, std::vector<ExtensionDefine>>>(j, "ext_defs");
 }
 
 inline void to_json(json & j, const RuntimeConfigure & x) {
 j = json::object();
+if (x.deviceMode) {
+j["device_mode"] = x.deviceMode;
+}
 if (x.env) {
 j["env"] = x.env;
 }
@@ -1283,6 +1291,7 @@ x.commonOptions = get_stack_optional<CommonOptions>(j, "CommonOptions");
 x.commonResult = get_stack_optional<CommonResult>(j, "CommonResult");
 x.containerProcessStateInfo = get_stack_optional<ContainerProcessStateInfo>(j, "ContainerProcessStateInfo");
 x.deviceNode = get_stack_optional<DeviceNode>(j, "DeviceNode");
+x.deviceOption = get_stack_optional<DeviceOption>(j, "DeviceOption");
 x.dialogHandShakePayload = get_stack_optional<DialogHandShakePayload>(j, "DialogHandShakePayload");
 x.dialogMessage = get_stack_optional<DialogMessage>(j, "DialogMessage");
 x.exportDirs = get_stack_optional<ExportDirs>(j, "ExportDirs");
@@ -1354,6 +1363,9 @@ j["ContainerProcessStateInfo"] = x.containerProcessStateInfo;
 if (x.deviceNode) {
 j["DeviceNode"] = x.deviceNode;
 }
+if (x.deviceOption) {
+j["DeviceOption"] = x.deviceOption;
+}
 if (x.dialogHandShakePayload) {
 j["DialogHandShakePayload"] = x.dialogHandShakePayload;
 }
@@ -1467,6 +1479,18 @@ j["XDGDirectoryPermissions"] = x.xdgDirectoryPermissions;
 }
 }
 
+inline void from_json(const json & j, DeviceOption & x) {
+if (j == "passthru") x = DeviceOption::Passthru;
+else { throw std::runtime_error("Input JSON does not conform to schema!"); }
+}
+
+inline void to_json(json & j, const DeviceOption & x) {
+switch (x) {
+case DeviceOption::Passthru: j = "passthru"; break;
+default: throw std::runtime_error("Unexpected value in enumeration \"DeviceOption\": " + std::to_string(static_cast<int>(x)));
+}
+}
+
 inline void from_json(const json & j, InteractionMessageType & x) {
 if (j == "Downgrade") x = InteractionMessageType::Downgrade;
 else if (j == "Install") x = InteractionMessageType::Install;
diff --git a/libs/api/src/linglong/api/types/v1/LinglongAPIV1.hpp b/libs/api/src/linglong/api/types/v1/LinglongAPIV1.hpp
@@ -65,6 +65,7 @@ namespace linglong {
 namespace api {
 namespace types {
 namespace v1 {
+enum class DeviceOption : int;
 enum class InteractionMessageType : int;
 enum class State : int;
 }
@@ -98,6 +99,7 @@ std::optional<CommonOptions> commonOptions;
 std::optional<CommonResult> commonResult;
 std::optional<ContainerProcessStateInfo> containerProcessStateInfo;
 std::optional<DeviceNode> deviceNode;
+std::optional<DeviceOption> deviceOption;
 std::optional<DialogHandShakePayload> dialogHandShakePayload;
 std::optional<DialogMessage> dialogMessage;
 std::optional<ExportDirs> exportDirs;
diff --git a/libs/api/src/linglong/api/types/v1/RuntimeConfigure.hpp b/libs/api/src/linglong/api/types/v1/RuntimeConfigure.hpp
@@ -19,13 +19,24 @@
 
 #include "linglong/api/types/v1/ExtensionDefine.hpp"
 
+namespace linglong {
+namespace api {
+namespace types {
+namespace v1 {
+enum class DeviceOption : int;
+}
+}
+}
+}
+
 namespace linglong {
 namespace api {
 namespace types {
 namespace v1 {
 using nlohmann::json;
 
 struct RuntimeConfigure {
+std::optional<std::vector<DeviceOption>> deviceMode;
 std::optional<std::map<std::string, std::string>> env;
 /**
 * external extension definitions to extend the component
diff --git a/libs/common/src/linglong/common/dir.cpp b/libs/common/src/linglong/common/dir.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2025 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2025 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
@@ -47,4 +47,9 @@ std::filesystem::path getUserRuntimeConfigDir() noexcept
     return configDir / "linglong";
 }
 
+std::filesystem::path getSystemRuntimeConfigDir() noexcept
+{
+    return LINGLONG_SYSCONFDIR;
+}
+
 } // namespace linglong::common::dir
diff --git a/libs/common/src/linglong/common/dir.h b/libs/common/src/linglong/common/dir.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2025 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2025 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
@@ -25,4 +25,6 @@ std::filesystem::path getUserCacheDir() noexcept;
 
 std::filesystem::path getUserRuntimeConfigDir() noexcept;
 
+std::filesystem::path getSystemRuntimeConfigDir() noexcept;
+
 } // namespace linglong::common::dir
diff --git a/libs/linglong/src/linglong/cli/cli.cpp b/libs/linglong/src/linglong/cli/cli.cpp
@@ -625,7 +625,6 @@ int Cli::run(const RunOptions &options)
       .addUIdMapping(uid, uid, 1)
       .addGIdMapping(gid, gid, 1)
       .bindDefault()
-      .bindDevNode()
       .bindCgroup()
       .bindXDGRuntime()
       .bindUserGroup()
@@ -640,6 +639,28 @@ int Cli::run(const RunOptions &options)
       .forwardDefaultEnv()
       .enableSelfAdjustingMount();
 
+    bool devicePassthru = false;
+    if (runtimeConfig && runtimeConfig->deviceMode) {
+        for (const auto &option : *runtimeConfig->deviceMode) {
+            if (option == api::types::v1::DeviceOption::Passthru) {
+                devicePassthru = true;
+                break;
+            }
+        }
+    }
+    for (const auto &option : options.deviceOptions) {
+        if (option == api::types::v1::DeviceOption::Passthru) {
+            devicePassthru = true;
+            break;
+        }
+    }
+
+    if (devicePassthru) {
+        cfgBuilder.bindDev(true);
+    } else {
+        cfgBuilder.bindDevNode();
+    }
+
     std::vector<std::string> capabilities;
     // privileged mode shares host's user_namespace and add capabilities
     if (options.privileged) {
diff --git a/libs/linglong/src/linglong/cli/cli.h b/libs/linglong/src/linglong/cli/cli.h
@@ -9,6 +9,7 @@
 #include "linglong/api/dbus/v1/package_manager.h"
 #include "linglong/api/dbus/v1/task.h"
 #include "linglong/api/types/v1/CommonOptions.hpp"
+#include "linglong/api/types/v1/DeviceOption.hpp"
 #include "linglong/api/types/v1/PackageInfoDisplay.hpp"
 #include "linglong/api/types/v1/RepositoryCacheLayersItem.hpp"
 #include "linglong/cli/interactive_notifier.h"
@@ -58,6 +59,7 @@ struct RunOptions
     std::vector<std::string> extensions;
     bool privileged{ false };
     std::vector<std::string> capsAdd;
+    std::vector<api::types::v1::DeviceOption> deviceOptions;
 };
 
 struct EnterOptions
diff --git a/libs/linglong/tests/ll-tests/src/linglong/utils/runtime_config_test.cpp b/libs/linglong/tests/ll-tests/src/linglong/utils/runtime_config_test.cpp
diff --git a/libs/oci-cfg-generators/src/linglong/oci-cfg-generators/container_cfg_builder.cpp b/libs/oci-cfg-generators/src/linglong/oci-cfg-generators/container_cfg_builder.cpp
diff --git a/libs/oci-cfg-generators/src/linglong/oci-cfg-generators/container_cfg_builder.h b/libs/oci-cfg-generators/src/linglong/oci-cfg-generators/container_cfg_builder.h
diff --git a/libs/utils/src/linglong/utils/runtime_config.cpp b/libs/utils/src/linglong/utils/runtime_config.cpp

Original file line number	Diff line number	Diff line change
`@@ -1439,6 +1439,12 @@`
`1439`	`1439`	`"type": "string"`
`1440`	`1440`	`}`
`1441`	`1441`	`},`
	`1442`	`+ "device_mode": {`
	`1443`	`+ "type": "array",`
	`1444`	`+ "items": {`
	`1445`	`+ "$ref": "#/$defs/DeviceOption"`
	`1446`	`+ }`
	`1447`	`+ },`
`1442`	`1448`	`"ext_defs": {`
`1443`	`1449`	`"description": "external extension definitions to extend the component",`
`1444`	`1450`	`"type": "object",`
`@@ -1450,6 +1456,12 @@`
`1450`	`1456`	`}`
`1451`	`1457`	`}`
`1452`	`1458`	`}`
	`1459`	`+ },`
	`1460`	`+ "DeviceOption": {`
	`1461`	`+ "description": "device option",`
	`1462`	`+ "enum": [`
	`1463`	`+ "passthru"`
	`1464`	`+ ]`
`1453`	`1465`	`}`
`1454`	`1466`	`},`
`1455`	`1467`	`"type": "object",`
`@@ -1594,6 +1606,9 @@`
`1594`	`1606`	`},`
`1595`	`1607`	`"RuntimeConfigure": {`
`1596`	`1608`	`"$ref": "#/$defs/RuntimeConfigure"`
	`1609`	`+ },`
	`1610`	`+ "DeviceOption": {`
	`1611`	`+ "$ref": "#/$defs/DeviceOption"`
`1597`	`1612`	`}`
`1598`	`1613`	`}`
`1599`	`1614`	`}`