Merge branch 'aj-chdir-initfs-message' into 'master'

Add more descriptive error message for when initfs chdir fails

See merge request redox-os/kernel!150
This commit is contained in:
Jeremy Soller
2020-08-17 16:25:46 +00:00

View File

@@ -170,7 +170,12 @@ pub extern fn userspace_init() {
let path = b"initfs:/bin/init";
let env = unsafe { INIT_ENV };
assert_eq!(syscall::chdir(b"initfs:"), Ok(0));
if let Err(err) = syscall::chdir(b"initfs:") {
info!("Failed to enter initfs ({}).", err);
info!("Perhaps the kernel was compiled with an incorrect INITFS_FOLDER \
environment variable value?");
panic!("Unexpected error while trying to enter initfs:.");
}
assert_eq!(syscall::open(b"debug:", syscall::flag::O_RDONLY).map(FileHandle::into), Ok(0));
assert_eq!(syscall::open(b"debug:", syscall::flag::O_WRONLY).map(FileHandle::into), Ok(1));