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

Cleanup path usage

Browse source
This commit is contained in:
Jeremy Soller 2016-11-29 18:14:10 -07:00
parent 941200b658
commit 9d879f95ed
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
filesystem/etc/init.rc
View file

@ -6,7 +6,6 @@
/sbin/tcpd /sbin/tcpd
/sbin/udpd /sbin/udpd
dhcpd -b dhcpd -b
httpd -b /ref
getty display:2 getty display:2
getty display:3 getty display:3
stdio debug: stdio debug:

4
filesystem/etc/passwd
View file

@ -1,2 +1,2 @@
root;$argon2i$m=4096,t=10,p=1$Tnc4UVV0N00$ML9LIOujd3nmAfkAwEcSTMPqakWUF0OUiLWrIy0nGLk;0;0;root;file:root;file:bin/ion root;$argon2i$m=4096,t=10,p=1$Tnc4UVV0N00$ML9LIOujd3nmAfkAwEcSTMPqakWUF0OUiLWrIy0nGLk;0;0;root;/root;/bin/ion
user;;1000;1000;user;file:home/user;file:bin/ion user;;1000;1000;user;/home/user;/bin/ion

13
initfs/etc/init.rc
View file

@ -1,8 +1,9 @@
initfs:bin/vesad T T T G export PATH initfs:/bin
vesad T T T G
stdio display:1 stdio display:1
initfs:bin/ps2d ps2d
initfs:bin/pcid initfs:etc/pcid.toml pcid /etc/pcid.toml
initfs:bin/redoxfs disk:0 redoxfs disk:0
cd file: cd file:
export PATH file:bin export PATH file:/bin
run file:etc/init.rc run /etc/init.rc

4
kernel/lib.rs
View file

@ -91,13 +91,13 @@ pub fn cpu_count() -> usize {
/// Initialize userspace by running the initfs:bin/init process /// Initialize userspace by running the initfs:bin/init process
/// This function will also set the CWD to initfs:bin and open debug: as stdio /// This function will also set the CWD to initfs:bin and open debug: as stdio
pub extern fn userspace_init() { pub extern fn userspace_init() {
assert_eq!(syscall::chdir(b"initfs:bin"), Ok(0)); assert_eq!(syscall::chdir(b"initfs:"), Ok(0));
assert_eq!(syscall::open(b"debug:", syscall::flag::O_RDONLY).map(FileHandle::into), Ok(0)); 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)); assert_eq!(syscall::open(b"debug:", syscall::flag::O_WRONLY).map(FileHandle::into), Ok(1));
assert_eq!(syscall::open(b"debug:", syscall::flag::O_WRONLY).map(FileHandle::into), Ok(2)); assert_eq!(syscall::open(b"debug:", syscall::flag::O_WRONLY).map(FileHandle::into), Ok(2));
syscall::exec(b"initfs:bin/init", &[]).expect("failed to execute initfs:init"); syscall::exec(b"initfs:/bin/init", &[]).expect("failed to execute initfs:init");
panic!("initfs:init returned") panic!("initfs:init returned")
} }

2
schemes/redoxfs

@ -1 +1 @@
Subproject commit b526a29e35066a7a301f6a62e3cb336492cb8068 Subproject commit f1073d0c4836ea76efe3bf3de2e0d9dc68d62354