P7 login diagnostics, P11 init noise reduction, config layering fix
This commit is contained in:
@@ -0,0 +1,13 @@
|
||||
diff --git a/init/src/main.rs b/init/src/main.rs
|
||||
index e7f6712f..6b9da2b2 100644
|
||||
--- a/init/src/main.rs
|
||||
+++ b/init/src/main.rs
|
||||
@@ -169,0 +170 @@ fn main() {
|
||||
+ if init_config.log_debug {
|
||||
@@ -171 +172,2 @@ fn main() {
|
||||
- init_warn(&format!("rootfs-file: {}", name));
|
||||
+ init_debug(&format!("rootfs-file: {}", name));
|
||||
+ }
|
||||
@@ -180 +182 @@ fn main() {
|
||||
- init_warn(&format!(
|
||||
+ init_debug(&format!(
|
||||
@@ -0,0 +1,7 @@
|
||||
diff --git a/src/main.rs b/src/main.rs
|
||||
index be5f3b7..531b167 100644
|
||||
--- a/src/main.rs
|
||||
+++ b/src/main.rs
|
||||
@@ -514 +514 @@ fn main(os: &impl Os) -> (usize, u64, KernelArgs) {
|
||||
- "Redox OS Bootloader {} on {}",
|
||||
+ "RedBear OS Bootloader {} on {}",
|
||||
@@ -0,0 +1,46 @@
|
||||
diff --git a/src/bin/login.rs b/src/bin/login.rs
|
||||
index 6e1fda6..e0878c9 100644
|
||||
--- a/src/bin/login.rs
|
||||
+++ b/src/bin/login.rs
|
||||
@@ -193,2 +193,7 @@ pub fn main() {
|
||||
- let before_ns_fd =
|
||||
- apply_login_schemes(user, &DEFAULT_SCHEMES).unwrap_or_exit(1);
|
||||
+ let before_ns_fd = match apply_login_schemes(user, &DEFAULT_SCHEMES) {
|
||||
+ Ok(fd) => fd,
|
||||
+ Err(err) => {
|
||||
+ eprintln!("login: apply_login_schemes failed: {}", err);
|
||||
+ std::process::exit(1);
|
||||
+ }
|
||||
+ };
|
||||
@@ -201,2 +206,8 @@ pub fn main() {
|
||||
- drop_privileges(user).unwrap_or_exit(1);
|
||||
- spawn_shell(user).unwrap_or_exit(1);
|
||||
+ if let Err(err) = drop_privileges(user) {
|
||||
+ eprintln!("login: drop_privileges failed: {}", err);
|
||||
+ std::process::exit(1);
|
||||
+ }
|
||||
+ if let Err(err) = spawn_shell(user) {
|
||||
+ eprintln!("login: spawn_shell failed: {}", err);
|
||||
+ std::process::exit(1);
|
||||
+ }
|
||||
@@ -225,2 +236,7 @@ pub fn main() {
|
||||
- let before_ns_fd =
|
||||
- apply_login_schemes(user, &DEFAULT_SCHEMES).unwrap_or_exit(1);
|
||||
+ let before_ns_fd = match apply_login_schemes(user, &DEFAULT_SCHEMES) {
|
||||
+ Ok(fd) => fd,
|
||||
+ Err(err) => {
|
||||
+ eprintln!("login: apply_login_schemes failed: {}", err);
|
||||
+ std::process::exit(1);
|
||||
+ }
|
||||
+ };
|
||||
@@ -233,2 +249,8 @@ pub fn main() {
|
||||
- drop_privileges(user).unwrap_or_exit(1);
|
||||
- spawn_shell(user).unwrap_or_exit(1);
|
||||
+ if let Err(err) = drop_privileges(user) {
|
||||
+ eprintln!("login: drop_privileges failed: {}", err);
|
||||
+ std::process::exit(1);
|
||||
+ }
|
||||
+ if let Err(err) = spawn_shell(user) {
|
||||
+ eprintln!("login: spawn_shell failed: {}", err);
|
||||
+ std::process::exit(1);
|
||||
+ }
|
||||
@@ -1,12 +1,10 @@
|
||||
|
||||
_ _
|
||||
| | (_)
|
||||
| | ___ _ ___ _ __ _ _ ___
|
||||
| |/ / || |/ _ \ | '_ \| | | / __|
|
||||
| < | || | (_) || |_) | |_| \__ \
|
||||
|_|\_\|_|/ |\___/ | .__/ \__,_|___/
|
||||
|__/ | |
|
||||
|_|
|
||||
|
||||
Red Bear OS v0.2.0 "Liliya" — Built on Redox OS
|
||||
____ _ ____ ___ ____
|
||||
| _ \ ___ __| | __ ) ___ __ _ _ __ / _ \/ ___|
|
||||
| |_) / _ \ / _` | _ \ / _ \/ _` | '__| | | | \___ \
|
||||
| _ < __/ (_| | |_) | __/ (_| | | | |_| |___) |
|
||||
|_| \_\___|\__,_|____/ \___|\__,_|_| \___/|____/
|
||||
|
||||
v0.2.2 "Liliya" — Built on Redox OS
|
||||
|
||||
Type 'help' for available commands.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
PRETTY_NAME="Red Bear OS 0.2.0 (Liliya)"
|
||||
PRETTY_NAME="Red Bear OS 0.2.2 (Liliya)"
|
||||
NAME="Red Bear OS"
|
||||
VERSION_ID="0.2.0"
|
||||
VERSION="0.2.0 (Liliya)"
|
||||
VERSION_ID="0.2.2"
|
||||
VERSION="0.2.2 (Liliya)"
|
||||
VERSION_CODENAME="liliya"
|
||||
ID="redbear-os"
|
||||
ID_LIKE="redox-os"
|
||||
|
||||
Reference in New Issue
Block a user