vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Load init from initfs

Browse source
This commit is contained in:
Jeremy Soller 2016-09-10 19:42:26 -06:00
parent 00db6ddd62
commit f2ca411cd6
3 changed files with 94 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
kernel/lib.rs
View file

@ -133,11 +133,23 @@ pub extern fn kmain() {
let pid = syscall::getpid();
println!("BSP: {:?}", pid);
assert_eq!(syscall::open("debug:".as_bytes(), 0), Ok(0));
assert_eq!(syscall::open("debug:".as_bytes(), 0), Ok(1));
assert_eq!(syscall::open("debug:".as_bytes(), 0), Ok(2));
assert_eq!(syscall::open(b"debug:", 0), Ok(0));
assert_eq!(syscall::open(b"debug:", 0), Ok(1));
assert_eq!(syscall::open(b"debug:", 0), Ok(2));
let elf = elf::Elf::from(include_bytes!("../build/userspace/init")).expect("could not load elf");
let init_file = syscall::open(b"initfs:init", 0).expect("failed to open initfs:init");
let mut init_data = collections::Vec::new();
loop {
let mut buf = [0; 65536];
let count = syscall::read(init_file, &mut buf).expect("failed to read initfs:init");
if count > 0 {
init_data.extend_from_slice(&buf[..count]);
} else {
break;
}
}
let elf = elf::Elf::from(&init_data).expect("could not load elf");
elf.run();
/*
@ -163,12 +175,9 @@ pub extern fn kmain_ap(id: usize) {
let pid = syscall::getpid();
println!("AP {}: {:?}", id, pid);
assert_eq!(syscall::open("debug:".as_bytes(), 0), Ok(0));
assert_eq!(syscall::open("debug:".as_bytes(), 0), Ok(1));
assert_eq!(syscall::open("debug:".as_bytes(), 0), Ok(2));
let elf = elf::Elf::from(include_bytes!("../build/userspace/init")).expect("could not load elf");
elf.run();
assert_eq!(syscall::open(b"debug:", 0), Ok(0));
assert_eq!(syscall::open(b"debug:", 0), Ok(1));
assert_eq!(syscall::open(b"debug:", 0), Ok(2));
loop {
unsafe { interrupt::enable_and_halt() }