mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-11 13:36:13 +03:00
Utilities/lsblk: Remove Interface Type column
We are going to remove this slice of data from the SysFS later on, so lsblk must not try to read it.
This commit is contained in:
parent
423dc71cc8
commit
c85f81bc9d
Notes:
sideshowbarker
2024-07-17 08:18:45 +09:00
Author: https://github.com/supercomputer7 Commit: https://github.com/SerenityOS/serenity/commit/c85f81bc9d Pull-request: https://github.com/SerenityOS/serenity/pull/14779 Reviewed-by: https://github.com/kleinesfilmroellchen
@ -13,7 +13,7 @@
|
||||
#include <LibCore/System.h>
|
||||
#include <LibMain/Main.h>
|
||||
|
||||
static constexpr StringView format_row = "{:10s}\t{:10s}\t{:10s}\t{:10s}\t{:10s}"sv;
|
||||
static constexpr StringView format_row = "{:10s}\t{:10s}\t{:10s}\t{:10s}"sv;
|
||||
|
||||
ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||
{
|
||||
@ -31,7 +31,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||
return 1;
|
||||
}
|
||||
|
||||
outln(format_row, "LUN"sv, "Interface type"sv, "Command set"sv, "Block Size"sv, "Last LBA"sv);
|
||||
outln(format_row, "LUN"sv, "Command set"sv, "Block Size"sv, "Last LBA"sv);
|
||||
|
||||
TRY(Core::System::pledge("stdio rpath"));
|
||||
|
||||
@ -42,11 +42,6 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||
dbgln("Error: Could not open {}: {}", command_set_file->name(), command_set_file->error_string());
|
||||
continue;
|
||||
}
|
||||
auto interface_type_file = Core::File::construct(String::formatted("/sys/devices/storage/{}/interface_type", dir));
|
||||
if (!interface_type_file->open(Core::OpenMode::ReadOnly)) {
|
||||
dbgln("Error: Could not open {}: {}", interface_type_file->name(), interface_type_file->error_string());
|
||||
continue;
|
||||
}
|
||||
auto last_lba_file = Core::File::construct(String::formatted("/sys/devices/storage/{}/last_lba", dir));
|
||||
if (!last_lba_file->open(Core::OpenMode::ReadOnly)) {
|
||||
dbgln("Error: Could not open {}: {}", last_lba_file->name(), last_lba_file->error_string());
|
||||
@ -59,11 +54,10 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||
}
|
||||
|
||||
String command_set = StringView(command_set_file->read_all().bytes());
|
||||
String interface_type = StringView(interface_type_file->read_all().bytes());
|
||||
String last_lba = StringView(last_lba_file->read_all().bytes());
|
||||
String sector_size = StringView(sector_size_file->read_all().bytes());
|
||||
|
||||
outln(format_row, dir, interface_type, command_set, sector_size, last_lba);
|
||||
outln(format_row, dir, command_set, sector_size, last_lba);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user