RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 06:04:57 +00:00
Code Issues Activity Actions

Services: Use new global variables at /sys/kernel/ directory

Browse source
This commit is contained in:
Liav A 2022-10-14 21:56:07 +03:00 • committed by Andrew Kaster
parent b579d9518c
commit 35c98a031a
11 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Services/DHCPClient/DHCPv4Client.cpp
View file

@ -177,7 +177,7 @@ void DHCPv4Client::try_discover_ifs()
ErrorOr<DHCPv4Client::Interfaces> 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);

2
Userland/Services/DHCPClient/main.cpp
View file

@ -21,7 +21,7 @@ ErrorOr<int> 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));

2
Userland/Services/LoginServer/main.cpp
View file

@ -70,7 +70,7 @@ ErrorOr<int> 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));

4
Userland/Services/LookupServer/MulticastDNS.cpp
View file

@ -114,9 +114,9 @@ ErrorOr<size_t> MulticastDNS::emit_packet(Packet const& packet, sockaddr_in cons
Vector<IPv4Address> 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 {};
}

2
Userland/Services/LookupServer/main.cpp
View file

@ -17,7 +17,7 @@ ErrorOr<int> 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();

4
Userland/Services/NetworkServer/main.cpp
View file

@ -18,7 +18,7 @@
ErrorOr<int> 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<int> 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());

2
Userland/Services/SpiceAgent/main.cpp
View file

@ -18,7 +18,7 @@ ErrorOr<int> 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));

2
Userland/Services/SystemServer/main.cpp
View file

@ -70,7 +70,7 @@ static ErrorOr<void> 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.

2
Userland/Services/WebContent/main.cpp
View file

@ -23,7 +23,7 @@ ErrorOr<int> 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"));

2
Userland/Services/WindowServer/KeymapSwitcher.cpp
View file

@ -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();

2
Userland/Services/WindowServer/main.cpp
View file

@ -31,7 +31,7 @@ ErrorOr<int> 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;