From 59c1746491d8b6dbdc9cac36ff9941c644c70468 Mon Sep 17 00:00:00 2001 From: Yuhao Zhou Date: Tue, 7 May 2019 00:47:10 +0800 Subject: [PATCH] Update default shell. --- kernel/src/shell.rs | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/kernel/src/shell.rs b/kernel/src/shell.rs index f12b080..7004ae9 100644 --- a/kernel/src/shell.rs +++ b/kernel/src/shell.rs @@ -6,7 +6,7 @@ use crate::process::*; use alloc::string::String; use alloc::vec::Vec; -#[cfg(not(any(feature = "run_cmdline", feature = "board_thinpad")))] +#[cfg(not(feature = "run_cmdline"))] pub fn add_user_shell() { // the busybox of alpine linux can not transfer env vars into child process // Now we use busybox from @@ -38,21 +38,6 @@ pub fn add_user_shell() { } } -#[cfg(feature = "board_thinpad")] -pub fn add_user_shell() { - use crate::fs::INodeExt; - if let Ok(inode) = ROOT_INODE.lookup("sh") { - processor().manager().add(Thread::new_user( - &inode, - "sh", - vec!["sh".into()], - Vec::new(), - )); - } else { - processor().manager().add(Thread::new_kernel(shell, 0)); - } -} - #[cfg(feature = "run_cmdline")] pub fn add_user_shell() { use crate::drivers::CMDLINE;