From 751aae77bcdb8124830a417b8b3c7569097b7026 Mon Sep 17 00:00:00 2001 From: Liav A Date: Sat, 12 Aug 2023 13:57:13 +0300 Subject: [PATCH] Kernel: Rename /sys/kernel/variables => /sys/kernel/conf The name "variables" is a bit awkward and what the directory entries are really about is kernel configuration so let's make it clear with the new name. --- Base/usr/share/man/man7/Mitigations.md | 2 +- Base/usr/share/man/man8/sysctl.md | 2 +- Kernel/CMakeLists.txt | 14 ++++---- .../BooleanVariable.cpp | 4 +-- .../BooleanVariable.h | 2 +- .../CapsLockRemap.cpp | 4 +-- .../CapsLockRemap.h | 4 +-- .../CoredumpDirectory.cpp | 4 +-- .../CoredumpDirectory.h | 4 +-- .../Kernel/Configuration/Directory.cpp | 36 +++++++++++++++++++ .../Kernel/Configuration/Directory.h | 24 +++++++++++++ .../DumpKmallocStack.cpp | 4 +-- .../DumpKmallocStack.h | 4 +-- .../StringVariable.cpp | 4 +-- .../StringVariable.h | 2 +- .../UBSANDeadly.cpp | 4 +-- .../UBSANDeadly.h | 4 +-- .../SysFS/Subsystems/Kernel/Directory.cpp | 4 +-- .../Subsystems/Kernel/Variables/Directory.cpp | 36 ------------------- .../Subsystems/Kernel/Variables/Directory.h | 24 ------------- .../KeyboardSettingsWidget.cpp | 2 +- .../Applications/KeyboardSettings/main.cpp | 2 +- Userland/Services/SystemServer/main.cpp | 2 +- Userland/Utilities/sysctl.cpp | 6 ++-- 24 files changed, 99 insertions(+), 99 deletions(-) rename Kernel/FileSystem/SysFS/Subsystems/Kernel/{Variables => Configuration}/BooleanVariable.cpp (89%) rename Kernel/FileSystem/SysFS/Subsystems/Kernel/{Variables => Configuration}/BooleanVariable.h (95%) rename Kernel/FileSystem/SysFS/Subsystems/Kernel/{Variables => Configuration}/CapsLockRemap.cpp (84%) rename Kernel/FileSystem/SysFS/Subsystems/Kernel/{Variables => Configuration}/CapsLockRemap.h (82%) rename Kernel/FileSystem/SysFS/Subsystems/Kernel/{Variables => Configuration}/CoredumpDirectory.cpp (90%) rename Kernel/FileSystem/SysFS/Subsystems/Kernel/{Variables => Configuration}/CoredumpDirectory.h (82%) create mode 100644 Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/Directory.cpp create mode 100644 Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/Directory.h rename Kernel/FileSystem/SysFS/Subsystems/Kernel/{Variables => Configuration}/DumpKmallocStack.cpp (84%) rename Kernel/FileSystem/SysFS/Subsystems/Kernel/{Variables => Configuration}/DumpKmallocStack.h (82%) rename Kernel/FileSystem/SysFS/Subsystems/Kernel/{Variables => Configuration}/StringVariable.cpp (89%) rename Kernel/FileSystem/SysFS/Subsystems/Kernel/{Variables => Configuration}/StringVariable.h (95%) rename Kernel/FileSystem/SysFS/Subsystems/Kernel/{Variables => Configuration}/UBSANDeadly.cpp (83%) rename Kernel/FileSystem/SysFS/Subsystems/Kernel/{Variables => Configuration}/UBSANDeadly.h (79%) delete mode 100644 Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/Directory.cpp delete mode 100644 Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/Directory.h diff --git a/Base/usr/share/man/man7/Mitigations.md b/Base/usr/share/man/man7/Mitigations.md index 4f890e56f89..cd53e37f1c6 100644 --- a/Base/usr/share/man/man7/Mitigations.md +++ b/Base/usr/share/man/man7/Mitigations.md @@ -102,7 +102,7 @@ Special restrictions on filesystem also apply: - Write access is forbidden to the `/sys/kernel/power_state` node. - Read accesses is forbidden by default to all nodes in `/sys/kernel` directory, except for: `df`, `interrupts`, `keymap`, `memstat`, `processes`, `stats` and `uptime`. -- Write access is forbidden to kernel variables (which are located in `/sys/kernel/variables`). +- Write access is forbidden to kernel configuration variables (which are located in `/sys/kernel/conf`). - Open access is forbidden to all device nodes except for `/dev/full`, `/dev/null`, `/dev/zero`, `/dev/random` and various other TTY/PTY devices (not including Kernel virtual consoles). - Executing SUID binaries is forbidden. diff --git a/Base/usr/share/man/man8/sysctl.md b/Base/usr/share/man/man8/sysctl.md index 7691c51f2fe..b52f136f513 100644 --- a/Base/usr/share/man/man8/sysctl.md +++ b/Base/usr/share/man/man8/sysctl.md @@ -12,7 +12,7 @@ sysctl - configure kernel parameters at runtime sysctl is a utility for managing kernel configuration parameters at runtime. This requires root privileges, and can crash your system. -Available parameters are listed under /sys/kernel/variables/. +Available parameters are listed under /sys/kernel/conf/. ## Options diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index e49e3ed1213..72b2aa387ae 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -202,13 +202,13 @@ set(KERNEL_SOURCES FileSystem/SysFS/Subsystems/Kernel/Network/UDP.cpp FileSystem/SysFS/Subsystems/Kernel/Constants/ConstantInformation.cpp FileSystem/SysFS/Subsystems/Kernel/Constants/Directory.cpp - FileSystem/SysFS/Subsystems/Kernel/Variables/BooleanVariable.cpp - FileSystem/SysFS/Subsystems/Kernel/Variables/CapsLockRemap.cpp - FileSystem/SysFS/Subsystems/Kernel/Variables/CoredumpDirectory.cpp - FileSystem/SysFS/Subsystems/Kernel/Variables/Directory.cpp - FileSystem/SysFS/Subsystems/Kernel/Variables/DumpKmallocStack.cpp - FileSystem/SysFS/Subsystems/Kernel/Variables/StringVariable.cpp - FileSystem/SysFS/Subsystems/Kernel/Variables/UBSANDeadly.cpp + FileSystem/SysFS/Subsystems/Kernel/Configuration/BooleanVariable.cpp + FileSystem/SysFS/Subsystems/Kernel/Configuration/CapsLockRemap.cpp + FileSystem/SysFS/Subsystems/Kernel/Configuration/CoredumpDirectory.cpp + FileSystem/SysFS/Subsystems/Kernel/Configuration/Directory.cpp + FileSystem/SysFS/Subsystems/Kernel/Configuration/DumpKmallocStack.cpp + FileSystem/SysFS/Subsystems/Kernel/Configuration/StringVariable.cpp + FileSystem/SysFS/Subsystems/Kernel/Configuration/UBSANDeadly.cpp FileSystem/VirtualFileSystem.cpp Firmware/ACPI/Initialize.cpp Firmware/ACPI/Parser.cpp diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/BooleanVariable.cpp b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/BooleanVariable.cpp similarity index 89% rename from Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/BooleanVariable.cpp rename to Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/BooleanVariable.cpp index e876ed50f01..947dbb5851c 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/BooleanVariable.cpp +++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/BooleanVariable.cpp @@ -1,10 +1,10 @@ /* - * Copyright (c) 2022, Liav A. + * Copyright (c) 2022-2023, Liav A. * * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/BooleanVariable.h b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/BooleanVariable.h similarity index 95% rename from Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/BooleanVariable.h rename to Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/BooleanVariable.h index 89d572cf8b6..0ef3d9f7287 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/BooleanVariable.h +++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/BooleanVariable.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Liav A. + * Copyright (c) 2022-2023, Liav A. * * SPDX-License-Identifier: BSD-2-Clause */ diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CapsLockRemap.cpp b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/CapsLockRemap.cpp similarity index 84% rename from Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CapsLockRemap.cpp rename to Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/CapsLockRemap.cpp index f54b515b0be..aba11c3aa68 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CapsLockRemap.cpp +++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/CapsLockRemap.cpp @@ -1,11 +1,11 @@ /* - * Copyright (c) 2022, Liav A. + * Copyright (c) 2022-2023, Liav A. * * SPDX-License-Identifier: BSD-2-Clause */ #include -#include +#include #include namespace Kernel { diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CapsLockRemap.h b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/CapsLockRemap.h similarity index 82% rename from Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CapsLockRemap.h rename to Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/CapsLockRemap.h index fbc196c3c78..47ba4dd8d30 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CapsLockRemap.h +++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/CapsLockRemap.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Liav A. + * Copyright (c) 2022-2023, Liav A. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CoredumpDirectory.cpp b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/CoredumpDirectory.cpp similarity index 90% rename from Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CoredumpDirectory.cpp rename to Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/CoredumpDirectory.cpp index 592e3426cb3..0e84049eccd 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CoredumpDirectory.cpp +++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/CoredumpDirectory.cpp @@ -1,10 +1,10 @@ /* - * Copyright (c) 2022, Liav A. + * Copyright (c) 2022-2023, Liav A. * * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CoredumpDirectory.h b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/CoredumpDirectory.h similarity index 82% rename from Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CoredumpDirectory.h rename to Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/CoredumpDirectory.h index 2ddac32d1ef..fee5f43f10e 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CoredumpDirectory.h +++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/CoredumpDirectory.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Liav A. + * Copyright (c) 2022-2023, Liav A. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -8,7 +8,7 @@ #include #include -#include +#include #include namespace Kernel { diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/Directory.cpp b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/Directory.cpp new file mode 100644 index 00000000000..05a8de62a42 --- /dev/null +++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/Directory.cpp @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2022-2023, Liav A. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +namespace Kernel { + +UNMAP_AFTER_INIT NonnullRefPtr SysFSKernelConfigurationDirectory::must_create(SysFSDirectory const& parent_directory) +{ + auto global_variables_directory = adopt_ref_if_nonnull(new (nothrow) SysFSKernelConfigurationDirectory(parent_directory)).release_nonnull(); + MUST(global_variables_directory->m_child_components.with([&](auto& list) -> ErrorOr { + list.append(SysFSCapsLockRemap::must_create(*global_variables_directory)); + list.append(SysFSDumpKmallocStacks::must_create(*global_variables_directory)); + list.append(SysFSUBSANDeadly::must_create(*global_variables_directory)); + list.append(SysFSCoredumpDirectory::must_create(*global_variables_directory)); + return {}; + })); + return global_variables_directory; +} + +UNMAP_AFTER_INIT SysFSKernelConfigurationDirectory::SysFSKernelConfigurationDirectory(SysFSDirectory const& parent_directory) + : SysFSDirectory(parent_directory) +{ +} + +} diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/Directory.h b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/Directory.h new file mode 100644 index 00000000000..15a054b496b --- /dev/null +++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/Directory.h @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021-2023, Liav A. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include +#include +#include + +namespace Kernel { + +class SysFSKernelConfigurationDirectory : public SysFSDirectory { +public: + static NonnullRefPtr must_create(SysFSDirectory const&); + virtual StringView name() const override { return "conf"sv; } + +private: + explicit SysFSKernelConfigurationDirectory(SysFSDirectory const&); +}; + +} diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/DumpKmallocStack.cpp b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/DumpKmallocStack.cpp similarity index 84% rename from Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/DumpKmallocStack.cpp rename to Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/DumpKmallocStack.cpp index 76c046f47a0..17d8a8eb55e 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/DumpKmallocStack.cpp +++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/DumpKmallocStack.cpp @@ -1,10 +1,10 @@ /* - * Copyright (c) 2022, Liav A. + * Copyright (c) 2022-2023, Liav A. * * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/DumpKmallocStack.h b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/DumpKmallocStack.h similarity index 82% rename from Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/DumpKmallocStack.h rename to Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/DumpKmallocStack.h index 0c1d2e31dea..d2c0c3c254e 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/DumpKmallocStack.h +++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/DumpKmallocStack.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Liav A. + * Copyright (c) 2022-2023, Liav A. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/StringVariable.cpp b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/StringVariable.cpp similarity index 89% rename from Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/StringVariable.cpp rename to Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/StringVariable.cpp index 638c54c1363..f6ab78410d3 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/StringVariable.cpp +++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/StringVariable.cpp @@ -1,10 +1,10 @@ /* - * Copyright (c) 2022, Liav A. + * Copyright (c) 2022-2023, Liav A. * * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/StringVariable.h b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/StringVariable.h similarity index 95% rename from Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/StringVariable.h rename to Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/StringVariable.h index f9dd36c8834..d02a2accba5 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/StringVariable.h +++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/StringVariable.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Liav A. + * Copyright (c) 2022-2023, Liav A. * * SPDX-License-Identifier: BSD-2-Clause */ diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/UBSANDeadly.cpp b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/UBSANDeadly.cpp similarity index 83% rename from Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/UBSANDeadly.cpp rename to Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/UBSANDeadly.cpp index 1c92f771357..cf103b67470 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/UBSANDeadly.cpp +++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/UBSANDeadly.cpp @@ -1,11 +1,11 @@ /* - * Copyright (c) 2022, Liav A. + * Copyright (c) 2022-2023, Liav A. * * SPDX-License-Identifier: BSD-2-Clause */ #include -#include +#include #include namespace Kernel { diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/UBSANDeadly.h b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/UBSANDeadly.h similarity index 79% rename from Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/UBSANDeadly.h rename to Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/UBSANDeadly.h index 4259cf5c1bc..2508dc5305a 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/UBSANDeadly.h +++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Configuration/UBSANDeadly.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Liav A. + * Copyright (c) 2022-2023, Liav A. * * SPDX-License-Identifier: BSD-2-Clause */ @@ -8,7 +8,7 @@ #include #include -#include +#include #include namespace Kernel { diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Directory.cpp b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Directory.cpp index e0002094c13..a57280739ae 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Directory.cpp +++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Directory.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -23,7 +24,6 @@ #include #include #include -#include namespace Kernel { @@ -47,7 +47,7 @@ UNMAP_AFTER_INIT NonnullRefPtr SysFSGlobalKerne list.append(SysFSJails::must_create(*global_kernel_stats_directory)); list.append(SysFSGlobalNetworkStatsDirectory::must_create(*global_kernel_stats_directory)); - list.append(SysFSGlobalKernelVariablesDirectory::must_create(*global_kernel_stats_directory)); + list.append(SysFSKernelConfigurationDirectory::must_create(*global_kernel_stats_directory)); return {}; })); return global_kernel_stats_directory; diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/Directory.cpp b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/Directory.cpp deleted file mode 100644 index 3c20c2a0024..00000000000 --- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/Directory.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2022, Liav A. - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -namespace Kernel { - -UNMAP_AFTER_INIT NonnullRefPtr SysFSGlobalKernelVariablesDirectory::must_create(SysFSDirectory const& parent_directory) -{ - auto global_variables_directory = adopt_ref_if_nonnull(new (nothrow) SysFSGlobalKernelVariablesDirectory(parent_directory)).release_nonnull(); - MUST(global_variables_directory->m_child_components.with([&](auto& list) -> ErrorOr { - list.append(SysFSCapsLockRemap::must_create(*global_variables_directory)); - list.append(SysFSDumpKmallocStacks::must_create(*global_variables_directory)); - list.append(SysFSUBSANDeadly::must_create(*global_variables_directory)); - list.append(SysFSCoredumpDirectory::must_create(*global_variables_directory)); - return {}; - })); - return global_variables_directory; -} - -UNMAP_AFTER_INIT SysFSGlobalKernelVariablesDirectory::SysFSGlobalKernelVariablesDirectory(SysFSDirectory const& parent_directory) - : SysFSDirectory(parent_directory) -{ -} - -} diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/Directory.h b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/Directory.h deleted file mode 100644 index d6c17724ba1..00000000000 --- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/Directory.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2021, Liav A. - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include -#include -#include - -namespace Kernel { - -class SysFSGlobalKernelVariablesDirectory : public SysFSDirectory { -public: - static NonnullRefPtr must_create(SysFSDirectory const&); - virtual StringView name() const override { return "variables"sv; } - -private: - explicit SysFSGlobalKernelVariablesDirectory(SysFSDirectory const&); -}; - -} diff --git a/Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.cpp b/Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.cpp index a55aed1cfc5..e5c1701e7af 100644 --- a/Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.cpp +++ b/Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.cpp @@ -322,7 +322,7 @@ void KeyboardSettingsWidget::write_caps_lock_to_ctrl_sys_variable(bool caps_lock ErrorOr KeyboardSettingsWidget::read_caps_lock_to_ctrl_sys_variable() { - auto file = TRY(Core::File::open("/sys/kernel/variables/caps_lock_to_ctrl"sv, Core::File::OpenMode::Read)); + auto file = TRY(Core::File::open("/sys/kernel/conf/caps_lock_to_ctrl"sv, Core::File::OpenMode::Read)); auto buffer = TRY(file->read_until_eof()); StringView contents_string((char const*)buffer.data(), min(1, buffer.size())); return contents_string == "1"; diff --git a/Userland/Applications/KeyboardSettings/main.cpp b/Userland/Applications/KeyboardSettings/main.cpp index 04e659f910c..88377274881 100644 --- a/Userland/Applications/KeyboardSettings/main.cpp +++ b/Userland/Applications/KeyboardSettings/main.cpp @@ -29,7 +29,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(Core::System::unveil("/bin/keymap", "x")); TRY(Core::System::unveil("/bin/sysctl", "x")); TRY(Core::System::unveil("/sys/kernel/keymap", "r")); - TRY(Core::System::unveil("/sys/kernel/variables/caps_lock_to_ctrl", "r")); + TRY(Core::System::unveil("/sys/kernel/conf/caps_lock_to_ctrl", "r")); TRY(Core::System::unveil("/etc/Keyboard.ini", "r")); TRY(Core::System::unveil(nullptr, nullptr)); diff --git a/Userland/Services/SystemServer/main.cpp b/Userland/Services/SystemServer/main.cpp index dc16075949c..98f4f45a8c5 100644 --- a/Userland/Services/SystemServer/main.cpp +++ b/Userland/Services/SystemServer/main.cpp @@ -501,7 +501,7 @@ static ErrorOr create_tmp_coredump_directory() static ErrorOr set_default_coredump_directory() { dbgln("Setting /tmp/coredump as the coredump directory"); - auto sysfs_coredump_directory_variable_fd = TRY(Core::System::open("/sys/kernel/variables/coredump_directory"sv, O_RDWR)); + auto sysfs_coredump_directory_variable_fd = TRY(Core::System::open("/sys/kernel/conf/coredump_directory"sv, O_RDWR)); ScopeGuard close_on_exit([&] { close(sysfs_coredump_directory_variable_fd); }); diff --git a/Userland/Utilities/sysctl.cpp b/Userland/Utilities/sysctl.cpp index 33883dc187c..85a2a5d5919 100644 --- a/Userland/Utilities/sysctl.cpp +++ b/Userland/Utilities/sysctl.cpp @@ -14,7 +14,7 @@ static bool s_set_variable = false; static DeprecatedString get_variable(StringView name) { - auto path = DeprecatedString::formatted("/sys/kernel/variables/{}", name); + auto path = DeprecatedString::formatted("/sys/kernel/conf/{}", name); auto file = Core::File::open(path, Core::File::OpenMode::Read); if (file.is_error()) { warnln("Failed to open {}: {}", path, file.error()); @@ -42,7 +42,7 @@ static bool write_variable(StringView name, StringView value) auto old_value = get_variable(name); if (old_value.is_null()) return false; - auto path = DeprecatedString::formatted("/sys/kernel/variables/{}", name); + auto path = DeprecatedString::formatted("/sys/kernel/conf/{}", name); auto file = Core::File::open(path, Core::File::OpenMode::Write); if (file.is_error()) { warnln("Failed to open {}: {}", path, file.error()); @@ -80,7 +80,7 @@ static int handle_variables(Vector const& variables) static int handle_show_all() { - Core::DirIterator di("/sys/kernel/variables", Core::DirIterator::SkipDots); + Core::DirIterator di("/sys/kernel/conf", Core::DirIterator::SkipDots); if (di.has_error()) { outln("DirIterator: {}", di.error()); return 1;