justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Change initrd 'executable' bool to type enum.

Browse Source
This commit is contained in:
Justin C. Miller
2019-10-10 23:09:40 -07:00
parent 71fe3d733b
commit dd73cf833f
9 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/kernel/main.cpp
View File

@@ -108,7 +108,11 @@ kernel_main(kernel_args *header)
initrd::disk ird(header->initrd, heap);
log::info(logs::boot, "initrd loaded with %d files.", ird.files().count());
for (auto &f : ird.files())
log::info(logs::boot, " %s%s (%d bytes).", f.executable() ? "*" : "", f.name(), f.size());
log::info(logs::boot, " %s%s (%d bytes).",
f.type() == initrd::file_type::executable ? "*" :
f.type() == initrd::file_type::vdso ? "^" : "",
f.name(),
f.size());
/*
page_manager::get()->dump_pml4(nullptr, 0);
@@ -163,7 +167,7 @@ kernel_main(kernel_args *header)
sched->create_kernel_task(-1, logger_task);
for (auto &f : ird.files()) {
if (f.executable())
if (f.type() == initrd::file_type::executable)
sched->load_process(f.name(), f.data(), f.size());
}