From 35c98a031a17a81ab11060b1856ecd385ce7f7bc Mon Sep 17 00:00:00 2001 From: Liav A Date: Fri, 14 Oct 2022 21:56:07 +0300 Subject: [PATCH] Services: Use new global variables at /sys/kernel/ directory --- Userland/Services/DHCPClient/DHCPv4Client.cpp | 2 +- Userland/Services/DHCPClient/main.cpp | 2 +- Userland/Services/LoginServer/main.cpp | 2 +- Userland/Services/LookupServer/MulticastDNS.cpp | 4 ++-- Userland/Services/LookupServer/main.cpp | 2 +- Userland/Services/NetworkServer/main.cpp | 4 ++-- Userland/Services/SpiceAgent/main.cpp | 2 +- Userland/Services/SystemServer/main.cpp | 2 +- Userland/Services/WebContent/main.cpp | 2 +- Userland/Services/WindowServer/KeymapSwitcher.cpp | 2 +- Userland/Services/WindowServer/main.cpp | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Userland/Services/DHCPClient/DHCPv4Client.cpp b/Userland/Services/DHCPClient/DHCPv4Client.cpp index 72dac41450..91af46a8be 100644 --- a/Userland/Services/DHCPClient/DHCPv4Client.cpp +++ b/Userland/Services/DHCPClient/DHCPv4Client.cpp @@ -177,7 +177,7 @@ void DHCPv4Client::try_discover_ifs() ErrorOr DHCPv4Client::get_discoverable_interfaces() { - auto file = TRY(Core::File::open("/proc/net/adapters", Core::OpenMode::ReadOnly)); + auto file = TRY(Core::File::open("/sys/kernel/net/adapters", Core::OpenMode::ReadOnly)); auto file_contents = file->read_all(); auto json = JsonValue::from_string(file_contents); diff --git a/Userland/Services/DHCPClient/main.cpp b/Userland/Services/DHCPClient/main.cpp index 36d6802db0..a4dc24865e 100644 --- a/Userland/Services/DHCPClient/main.cpp +++ b/Userland/Services/DHCPClient/main.cpp @@ -21,7 +21,7 @@ ErrorOr serenity_main(Main::Arguments args) TRY(Core::System::pledge("stdio unix inet cpath rpath")); Core::EventLoop event_loop; - TRY(Core::System::unveil("/proc/net/", "r")); + TRY(Core::System::unveil("/sys/kernel/net/", "r")); TRY(Core::System::unveil(nullptr, nullptr)); auto client = TRY(DHCPv4Client::try_create(interfaces)); diff --git a/Userland/Services/LoginServer/main.cpp b/Userland/Services/LoginServer/main.cpp index 8ff9647ee9..4481b201ba 100644 --- a/Userland/Services/LoginServer/main.cpp +++ b/Userland/Services/LoginServer/main.cpp @@ -70,7 +70,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(Core::System::unveil("/etc/shadow", "r")); TRY(Core::System::unveil("/etc/group", "r")); TRY(Core::System::unveil("/bin/SystemServer", "x")); - TRY(Core::System::unveil("/proc/all", "r")); + TRY(Core::System::unveil("/sys/kernel/processes", "r")); TRY(Core::System::unveil("/res", "r")); TRY(Core::System::unveil(nullptr, nullptr)); diff --git a/Userland/Services/LookupServer/MulticastDNS.cpp b/Userland/Services/LookupServer/MulticastDNS.cpp index e76ed6846a..d148236cce 100644 --- a/Userland/Services/LookupServer/MulticastDNS.cpp +++ b/Userland/Services/LookupServer/MulticastDNS.cpp @@ -114,9 +114,9 @@ ErrorOr MulticastDNS::emit_packet(Packet const& packet, sockaddr_in cons Vector MulticastDNS::local_addresses() const { - auto file = Core::File::construct("/proc/net/adapters"); + auto file = Core::File::construct("/sys/kernel/net/adapters"); if (!file->open(Core::OpenMode::ReadOnly)) { - dbgln("Failed to open /proc/net/adapters: {}", file->error_string()); + dbgln("Failed to open /sys/kernel/net/adapters: {}", file->error_string()); return {}; } diff --git a/Userland/Services/LookupServer/main.cpp b/Userland/Services/LookupServer/main.cpp index 37a11e6cc3..9420a8eb02 100644 --- a/Userland/Services/LookupServer/main.cpp +++ b/Userland/Services/LookupServer/main.cpp @@ -17,7 +17,7 @@ ErrorOr serenity_main(Main::Arguments) auto server = TRY(LookupServer::LookupServer::try_create()); TRY(Core::System::pledge("stdio accept inet rpath")); - TRY(Core::System::unveil("/proc/net/adapters", "r")); + TRY(Core::System::unveil("/sys/kernel/net/adapters", "r")); TRY(Core::System::unveil("/etc/hosts", "r")); TRY(Core::System::unveil(nullptr, nullptr)); return event_loop.exec(); diff --git a/Userland/Services/NetworkServer/main.cpp b/Userland/Services/NetworkServer/main.cpp index 1d39b656a4..f466bf2a2d 100644 --- a/Userland/Services/NetworkServer/main.cpp +++ b/Userland/Services/NetworkServer/main.cpp @@ -18,7 +18,7 @@ ErrorOr serenity_main(Main::Arguments) { TRY(Core::System::pledge("stdio recvfd sendfd rpath unix exec proc")); - TRY(Core::System::unveil("/proc/net", "r")); + TRY(Core::System::unveil("/sys/kernel/net", "r")); TRY(Core::System::unveil("/bin/DHCPClient", "x")); TRY(Core::System::unveil("/etc/Network.ini", "r")); TRY(Core::System::unveil("/bin/ifconfig", "x")); @@ -28,7 +28,7 @@ ErrorOr serenity_main(Main::Arguments) auto config_file = TRY(Core::ConfigFile::open_for_system("Network")); - auto proc_net_adapters_file = TRY(Core::Stream::File::open("/proc/net/adapters"sv, Core::Stream::OpenMode::Read)); + auto proc_net_adapters_file = TRY(Core::Stream::File::open("/sys/kernel/net/adapters"sv, Core::Stream::OpenMode::Read)); auto data = TRY(proc_net_adapters_file->read_all()); JsonParser parser(data); JsonValue proc_net_adapters_json = TRY(parser.parse()); diff --git a/Userland/Services/SpiceAgent/main.cpp b/Userland/Services/SpiceAgent/main.cpp index 83634bacc8..00c7d8aa75 100644 --- a/Userland/Services/SpiceAgent/main.cpp +++ b/Userland/Services/SpiceAgent/main.cpp @@ -18,7 +18,7 @@ ErrorOr serenity_main(Main::Arguments) TRY(Core::System::pledge("unix rpath wpath stdio sendfd recvfd")); TRY(Core::System::unveil(SPICE_DEVICE, "rw"sv)); - TRY(Core::System::unveil("/proc/all", "r")); + TRY(Core::System::unveil("/sys/kernel/processes", "r")); TRY(Core::System::unveil("/tmp/session/%sid/portal/clipboard", "rw")); TRY(Core::System::unveil(nullptr, nullptr)); diff --git a/Userland/Services/SystemServer/main.cpp b/Userland/Services/SystemServer/main.cpp index 4bf612aa51..fc2beb4694 100644 --- a/Userland/Services/SystemServer/main.cpp +++ b/Userland/Services/SystemServer/main.cpp @@ -70,7 +70,7 @@ static ErrorOr determine_system_mode() g_system_mode = "text"; }); - auto f = Core::File::construct("/proc/system_mode"); + auto f = Core::File::construct("/sys/kernel/system_mode"); if (!f->open(Core::OpenMode::ReadOnly)) { dbgln("Failed to read system_mode: {}", f->error_string()); // Continue and assume "text" mode. diff --git a/Userland/Services/WebContent/main.cpp b/Userland/Services/WebContent/main.cpp index 8d88722686..1b7e33dbf3 100644 --- a/Userland/Services/WebContent/main.cpp +++ b/Userland/Services/WebContent/main.cpp @@ -23,7 +23,7 @@ ErrorOr serenity_main(Main::Arguments) { Core::EventLoop event_loop; TRY(Core::System::pledge("stdio recvfd sendfd accept unix rpath")); - TRY(Core::System::unveil("/proc/all", "r")); + TRY(Core::System::unveil("/sys/kernel/processes", "r")); TRY(Core::System::unveil("/res", "r")); TRY(Core::System::unveil("/etc/timezone", "r")); TRY(Core::System::unveil("/tmp/session/%sid/portal/request", "rw")); diff --git a/Userland/Services/WindowServer/KeymapSwitcher.cpp b/Userland/Services/WindowServer/KeymapSwitcher.cpp index 3290395ea0..279e744310 100644 --- a/Userland/Services/WindowServer/KeymapSwitcher.cpp +++ b/Userland/Services/WindowServer/KeymapSwitcher.cpp @@ -90,7 +90,7 @@ void KeymapSwitcher::next_keymap() String KeymapSwitcher::get_current_keymap() const { - auto proc_keymap = Core::File::construct("/proc/keymap"); + auto proc_keymap = Core::File::construct("/sys/kernel/keymap"); if (!proc_keymap->open(Core::OpenMode::ReadOnly)) VERIFY_NOT_REACHED(); diff --git a/Userland/Services/WindowServer/main.cpp b/Userland/Services/WindowServer/main.cpp index 8771a01412..62ced9a4be 100644 --- a/Userland/Services/WindowServer/main.cpp +++ b/Userland/Services/WindowServer/main.cpp @@ -31,7 +31,7 @@ ErrorOr serenity_main(Main::Arguments) TRY(Core::System::unveil("/dev/gpu/", "rw")); TRY(Core::System::unveil("/dev/input/", "rw")); TRY(Core::System::unveil("/bin/keymap", "x")); - TRY(Core::System::unveil("/proc/keymap", "r")); + TRY(Core::System::unveil("/sys/kernel/keymap", "r")); struct sigaction act = {}; act.sa_flags = SA_NOCLDWAIT;