Skip to content

add bin file add link #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add bin file add link #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added kernel/src/syscall/schedular.rs
View file
Open in desktop
Empty file.
6 changes: 3 additions & 3 deletions kernel/src/tasks/initproc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,13 @@ pub async fn initproc() {
// command("busybox ash lmbench_testcode.sh").await;
// command("busybox sh iozone_testcode.sh").await;
// command("busybox sh unixbench_testcode.sh").await;
// command("busybox sh cyclictest_testcode.sh").await;
command("busybox sh cyclictest_testcode.sh").await;
// command("./runtest.exe -w entry-static.exe fdopen").await;
command("./runtest.exe -w entry-static.exe socket").await;
// command("./runtest.exe -w entry-static.exe socket").await;
// command("./runtest.exe -w entry-dynamic.exe daemon_failure").await;
// command("./runtest.exe -w entry-dynamic.exe stat").await;
// command("./looper 2 ./multi.sh 1").await;
// command("busybox sh ./multi.sh 1").await;
// command("busybox ls /bin").await;
// command("busybox sh ./tst.sh ./sort.src").await;
// command("./runtest.exe -w entry-dynamic.exe pthread_cancel_points").await;

Expand Down
5 changes: 5 additions & 0 deletions modules/fs/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ pub fn init() {
filesystems.push(RamFs::new());
filesystems.push(RamFs::new());
filesystems.push(ProcFS::new());
filesystems.push(RamFs::new());

FILESYSTEMS.init_by(filesystems);

Expand All @@ -96,6 +97,7 @@ pub fn init() {
rootfs.mkdir("tmp_home").expect("can't create tmp_home dir");
rootfs.mkdir("var").expect("can't create var dir");
rootfs.mkdir("proc").expect("can't create proc dir");
rootfs.mkdir("bin").expect("can't create proc dir");

// let so_files: Vec<DirEntry> = rootfs
// .read_dir()
Expand Down Expand Up @@ -139,6 +141,9 @@ pub fn init() {
.link(&file.filename, &(String::from("/") + &file.filename))
.expect("can't link file to tmpfs");
}
let binfs = open("/bin").expect("can't open /bin");
// binfs.link("sh", "/busybox").expect("can't link /busyox");
binfs.link("sleep", "/busybox").expect("can't link /busyox");
}
cache::init();
}
Expand Down
1 change: 1 addition & 0 deletions modules/fs/src/mount.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ pub fn init() {
mount(String::from("/tmp_home"), 4).expect("can't mount to /tmp_home");
mount(String::from("/var"), 5).expect("can't mount to /var");
mount(String::from("/proc"), 6).expect("can't mount to /proc");
mount(String::from("/bin"), 7).expect("can't mount to /bin");
}

pub fn mount(path: String, fs_id: usize) -> VfsResult<()> {
Expand Down