Skip to content

fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config#172

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
yfblock wants to merge 1 commit into
base:main
Choose a base branch
from
+94 −26
Open

fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config #172

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
10 changes: 5 additions & 5 deletions README.en.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -270,11 +270,6 @@ dtb_file = "tools/device_tree.dtb"
# Kernel load address (optional)
kernel_load_addr = "0x80080000"

# Network boot configuration (optional)
[net]
interface = "eth0"
board_ip = "192.168.1.100"

# Board reset command (optional)
board_reset_cmd = "reset"

Expand All@@ -283,6 +278,11 @@ board_power_off_cmd = "poweroff"

# Failure boot regex patterns
fail_regex = ["Boot failed", "Error loading kernel"]

# Network boot configuration (optional)
[net]
interface = "eth0"
board_ip = "192.168.1.100"
```

### Ordered shell initialization steps
Expand Down
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -267,11 +267,6 @@ dtb_file = "tools/device_tree.dtb"
# 内核加载地址（可选）
kernel_load_addr = "0x80080000"

# 网络启动配置（可选）
[net]
interface = "eth0"
board_ip = "192.168.1.100"

# 板子重置命令（可选）
board_reset_cmd = "reset"

Expand All@@ -280,6 +275,11 @@ board_power_off_cmd = "poweroff"

# 失败启动的正则表达式
fail_regex = ["Boot failed", "Error loading kernel"]

# 网络启动配置（可选）
[net]
interface = "eth0"
board_ip = "192.168.1.100"
```

### 有序 Shell 初始化步骤
Expand Down
100 changes: 84 additions & 16 deletions ostool/src/run/uboot.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,11 +160,13 @@ pub struct LocalUbootConfig {
pub baud_rate: Option<String>,
/// TFTP boot configuration
pub net: Option<Net>,
/// Board reset command
/// shell command to reset the board
/// Legacy Rust API compatibility field. Use `UbootConfig::board_reset_cmd`.
#[serde(skip)]
#[schemars(skip)]
pub board_reset_cmd: Option<String>,
/// Board power off command
/// shell command to power off the board
/// Legacy Rust API compatibility field. Use `UbootConfig::board_power_off_cmd`.
#[serde(skip)]
#[schemars(skip)]
pub board_power_off_cmd: Option<String>,
}

Expand DownExpand Up@@ -451,7 +453,11 @@ pub(crate) async fn run_uboot_with_config(
input: UbootRunInput,
config: UbootConfig,
) -> anyhow::Result<()> {
let backend = LocalBackend::new(config.local.clone());
let backend = LocalBackend::new(
config.local.clone(),
config.board_reset_cmd.clone(),
config.board_power_off_cmd.clone(),
);
let mut runner = Runner::new(input, config, backend);
runner.run().await
}
Expand DownExpand Up@@ -591,6 +597,10 @@ trait RunnerBackend {

struct LocalBackend {
config: LocalUbootConfig,
/// Host-side reset command, taken from `UbootConfig::board_reset_cmd`.
reset_cmd: Option<String>,
/// Host-side power-off command, taken from `UbootConfig::board_power_off_cmd`.
power_off_cmd: Option<String>,
baud_rate: Option<u32>,
linux_system_tftp: Option<tftp::TftpdHpaConfig>,
linux_tftp_staging: Vec<tftp::LinuxTftpPrepared>,
Expand All@@ -599,9 +609,17 @@ struct LocalBackend {
}

impl LocalBackend {
fn new(config: LocalUbootConfig) -> Self {
fn new(
config: LocalUbootConfig,
reset_cmd: Option<String>,
power_off_cmd: Option<String>,
) -> Self {
let reset_cmd = reset_cmd.or_else(|| config.board_reset_cmd.clone());
let power_off_cmd = power_off_cmd.or_else(|| config.board_power_off_cmd.clone());
Self {
config,
reset_cmd,
power_off_cmd,
baud_rate: None,
linux_system_tftp: None,
linux_tftp_staging: Vec::new(),
Expand DownExpand Up@@ -746,7 +764,7 @@ impl RunnerBackend for LocalBackend {

async fn after_console_open(&mut self, context: &ProcessContext) -> anyhow::Result<()> {
println!("Waiting for board on power or reset...");
if let Some(cmd) = self.config.board_reset_cmd.as_deref()
if let Some(cmd) = self.reset_cmd.as_deref()
&& !cmd.trim().is_empty()
{
crate::process::shell_run_cmd(context, cmd)?;
Expand DownExpand Up@@ -805,7 +823,7 @@ impl RunnerBackend for LocalBackend {
}
}

if let Some(cmd) = self.config.board_power_off_cmd.as_deref()
if let Some(cmd) = self.power_off_cmd.as_deref()
&& !cmd.trim().is_empty()
&& let Err(err) = crate::process::shell_run_cmd(context, cmd)
{
Expand DownExpand Up@@ -1642,6 +1660,8 @@ mod tests {
fn local_backend() -> LocalBackend {
LocalBackend {
config: LocalUbootConfig::default(),
reset_cmd: None,
power_off_cmd: None,
baud_rate: None,
linux_system_tftp: None,
linux_tftp_staging: Vec::new(),
Expand DownExpand Up@@ -2278,7 +2298,7 @@ mod tests {
std::fs::write(prepared.target_dir().join("keep.txt"), b"keep").unwrap();
let marker = temp.path().join("powered-off");
let mut backend = local_backend();
backend.config.board_power_off_cmd = Some(format!("touch {}", marker.display()));
backend.power_off_cmd = Some(format!("touch {}", marker.display()));
backend.linux_tftp_staging.push(prepared);

let context = make_invocation(temp.path()).process_context().unwrap();
Expand DownExpand Up@@ -2416,6 +2436,56 @@ interface = "eth0"
assert_eq!(net.interface, "eth0");
}

#[test]
fn uboot_config_parses_board_commands_at_top_level() {
let config: UbootConfig = toml::from_str(
r#"
serial = "/dev/null"
baud_rate = "115200"
fail_regex = []
board_reset_cmd = "reset-board"
board_power_off_cmd = "power-off-board"
"#,
)
.unwrap();

assert_eq!(config.board_reset_cmd.as_deref(), Some("reset-board"));
assert_eq!(
config.board_power_off_cmd.as_deref(),
Some("power-off-board")
);
assert_eq!(config.local.board_reset_cmd, None);
assert_eq!(config.local.board_power_off_cmd, None);

let serialized = toml::to_string(&config).unwrap();
assert_eq!(serialized.matches("board_reset_cmd").count(), 1);
assert_eq!(serialized.matches("board_power_off_cmd").count(), 1);

let backend = LocalBackend::new(
config.local,
config.board_reset_cmd,
config.board_power_off_cmd,
);
assert_eq!(backend.reset_cmd.as_deref(), Some("reset-board"));
assert_eq!(backend.power_off_cmd.as_deref(), Some("power-off-board"));
}

#[test]
fn local_backend_keeps_legacy_command_fields_usable() {
let backend = LocalBackend::new(
LocalUbootConfig {
board_reset_cmd: Some("legacy-reset".into()),
board_power_off_cmd: Some("legacy-power-off".into()),
..Default::default()
},
None,
None,
);

assert_eq!(backend.reset_cmd.as_deref(), Some("legacy-reset"));
assert_eq!(backend.power_off_cmd.as_deref(), Some("legacy-power-off"));
}

#[test]
fn uboot_config_replaces_string_fields() {
let tmp = tempfile::tempdir().unwrap();
Expand DownExpand Up@@ -2460,6 +2530,8 @@ interface = "eth0"
kernel_load_addr: Some("${workspaceFolder}".into()),
fit_load_addr: Some("${package}".into()),
bootm_addr: Some("${workspace}".into()),
board_reset_cmd: Some("${workspace}".into()),
board_power_off_cmd: Some("${package}".into()),
fail_regex: vec!["${package}".into()],
uboot_cmd: Some(vec!["setenv boot ${workspace}".into()]),
shell_check_steps: vec![ShellCheckStep {
Expand All@@ -2471,15 +2543,14 @@ interface = "eth0"
local: LocalUbootConfig {
serial: Some("${workspace}/tty".into()),
baud_rate: Some("${env:OSTOOL_UBOOT_TEST_ENV}".into()),
board_reset_cmd: Some("${workspace}".into()),
board_power_off_cmd: Some("${package}".into()),
net: Some(Net {
interface: "${env:OSTOOL_UBOOT_TEST_ENV}".into(),
board_ip: Some("${workspace}".into()),
gatewayip: Some("${package}".into()),
netmask: Some("${workspaceFolder}".into()),
tftp_dir: Some("${package}/tftp".into()),
}),
..Default::default()
},
..Default::default()
};
Expand All@@ -2501,12 +2572,9 @@ interface = "eth0"
assert_eq!(config.kernel_load_addr.as_deref(), Some(expected.as_str()));
assert_eq!(config.fit_load_addr.as_deref(), Some(expected.as_str()));
assert_eq!(config.bootm_addr.as_deref(), Some(expected.as_str()));
assert_eq!(config.board_reset_cmd.as_deref(), Some(expected.as_str()));
assert_eq!(
config.local.board_reset_cmd.as_deref(),
Some(expected.as_str())
);
assert_eq!(
config.local.board_power_off_cmd.as_deref(),
config.board_power_off_cmd.as_deref(),
Some(expected.as_str())
);
assert_eq!(config.fail_regex, vec![expected.clone()]);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config by yfblock · Pull Request #172 · drivercraft/ostool · GitHub
Skip to content
fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config#172

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

yfblock
wants to merge
1
commit into

base:main
Choose a base branch

from


+94

−26

 Open


fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config
#172
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


10 changes: 5 additions & 5 deletions
README.en.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -270,11 +270,6 @@ dtb_file = "tools/device_tree.dtb"
# Kernel load address (optional)
kernel_load_addr = "0x80080000"

# Network boot configuration (optional)
[net]
interface = "eth0"
board_ip = "192.168.1.100"

# Board reset command (optional)
board_reset_cmd = "reset"

Expand All@@ -283,6 +278,11 @@ board_power_off_cmd = "poweroff"

# Failure boot regex patterns
fail_regex = ["Boot failed", "Error loading kernel"]

# Network boot configuration (optional)
[net]
interface = "eth0"
board_ip = "192.168.1.100"
```

### Ordered shell initialization steps
Expand Down

10 changes: 5 additions & 5 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -267,11 +267,6 @@ dtb_file = "tools/device_tree.dtb"
# 内核加载地址（可选）
kernel_load_addr = "0x80080000"

# 网络启动配置（可选）
[net]
interface = "eth0"
board_ip = "192.168.1.100"

# 板子重置命令（可选）
board_reset_cmd = "reset"

Expand All@@ -280,6 +275,11 @@ board_power_off_cmd = "poweroff"

# 失败启动的正则表达式
fail_regex = ["Boot failed", "Error loading kernel"]

# 网络启动配置（可选）
[net]
interface = "eth0"
board_ip = "192.168.1.100"
```

### 有序 Shell 初始化步骤
Expand Down

100 changes: 84 additions & 16 deletions
ostool/src/run/uboot.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,11 +160,13 @@ pub struct LocalUbootConfig {
 pub baud_rate: Option<String>,
 /// TFTP boot configuration
 pub net: Option<Net>,
 /// Board reset command
 /// shell command to reset the board
 /// Legacy Rust API compatibility field. Use `UbootConfig::board_reset_cmd`.
 #[serde(skip)]
 #[schemars(skip)]
 pub board_reset_cmd: Option<String>,
 /// Board power off command
 /// shell command to power off the board
 /// Legacy Rust API compatibility field. Use `UbootConfig::board_power_off_cmd`.
 #[serde(skip)]
 #[schemars(skip)]
 pub board_power_off_cmd: Option<String>,
}

Expand DownExpand Up@@ -451,7 +453,11 @@ pub(crate) async fn run_uboot_with_config(
 input: UbootRunInput,
 config: UbootConfig,
) -> anyhow::Result<()> {
 let backend = LocalBackend::new(config.local.clone());
 let backend = LocalBackend::new(
 config.local.clone(),
 config.board_reset_cmd.clone(),
 config.board_power_off_cmd.clone(),
 );
 let mut runner = Runner::new(input, config, backend);
 runner.run().await
}
Expand DownExpand Up@@ -591,6 +597,10 @@ trait RunnerBackend {

struct LocalBackend {
 config: LocalUbootConfig,
 /// Host-side reset command, taken from `UbootConfig::board_reset_cmd`.
 reset_cmd: Option<String>,
 /// Host-side power-off command, taken from `UbootConfig::board_power_off_cmd`.
 power_off_cmd: Option<String>,
 baud_rate: Option<u32>,
 linux_system_tftp: Option<tftp::TftpdHpaConfig>,
 linux_tftp_staging: Vec<tftp::LinuxTftpPrepared>,
Expand All@@ -599,9 +609,17 @@ struct LocalBackend {
}

impl LocalBackend {
 fn new(config: LocalUbootConfig) -> Self {
 fn new(
 config: LocalUbootConfig,
 reset_cmd: Option<String>,
 power_off_cmd: Option<String>,
 ) -> Self {
 let reset_cmd = reset_cmd.or_else(|| config.board_reset_cmd.clone());
 let power_off_cmd = power_off_cmd.or_else(|| config.board_power_off_cmd.clone());
 Self {
 config,
 reset_cmd,
 power_off_cmd,
 baud_rate: None,
 linux_system_tftp: None,
 linux_tftp_staging: Vec::new(),
Expand DownExpand Up@@ -746,7 +764,7 @@ impl RunnerBackend for LocalBackend {

 async fn after_console_open(&mut self, context: &ProcessContext) -> anyhow::Result<()> {
 println!("Waiting for board on power or reset...");
 if let Some(cmd) = self.config.board_reset_cmd.as_deref()
 if let Some(cmd) = self.reset_cmd.as_deref()
 && !cmd.trim().is_empty()
 {
 crate::process::shell_run_cmd(context, cmd)?;
Expand DownExpand Up@@ -805,7 +823,7 @@ impl RunnerBackend for LocalBackend {
 }
 }

 if let Some(cmd) = self.config.board_power_off_cmd.as_deref()
 if let Some(cmd) = self.power_off_cmd.as_deref()
 && !cmd.trim().is_empty()
 && let Err(err) = crate::process::shell_run_cmd(context, cmd)
 {
Expand DownExpand Up@@ -1642,6 +1660,8 @@ mod tests {
 fn local_backend() -> LocalBackend {
 LocalBackend {
 config: LocalUbootConfig::default(),
 reset_cmd: None,
 power_off_cmd: None,
 baud_rate: None,
 linux_system_tftp: None,
 linux_tftp_staging: Vec::new(),
Expand DownExpand Up@@ -2278,7 +2298,7 @@ mod tests {
 std::fs::write(prepared.target_dir().join("keep.txt"), b"keep").unwrap();
 let marker = temp.path().join("powered-off");
 let mut backend = local_backend();
 backend.config.board_power_off_cmd = Some(format!("touch {}", marker.display()));
 backend.power_off_cmd = Some(format!("touch {}", marker.display()));
 backend.linux_tftp_staging.push(prepared);

 let context = make_invocation(temp.path()).process_context().unwrap();
Expand DownExpand Up@@ -2416,6 +2436,56 @@ interface = "eth0"
 assert_eq!(net.interface, "eth0");
 }

 #[test]
 fn uboot_config_parses_board_commands_at_top_level() {
 let config: UbootConfig = toml::from_str(
 r#"
serial = "/dev/null"
baud_rate = "115200"
fail_regex = []
board_reset_cmd = "reset-board"
board_power_off_cmd = "power-off-board"
"#,
 )
 .unwrap();

 assert_eq!(config.board_reset_cmd.as_deref(), Some("reset-board"));
 assert_eq!(
 config.board_power_off_cmd.as_deref(),
 Some("power-off-board")
 );
 assert_eq!(config.local.board_reset_cmd, None);
 assert_eq!(config.local.board_power_off_cmd, None);

 let serialized = toml::to_string(&config).unwrap();
 assert_eq!(serialized.matches("board_reset_cmd").count(), 1);
 assert_eq!(serialized.matches("board_power_off_cmd").count(), 1);

 let backend = LocalBackend::new(
 config.local,
 config.board_reset_cmd,
 config.board_power_off_cmd,
 );
 assert_eq!(backend.reset_cmd.as_deref(), Some("reset-board"));
 assert_eq!(backend.power_off_cmd.as_deref(), Some("power-off-board"));
 }

 #[test]
 fn local_backend_keeps_legacy_command_fields_usable() {
 let backend = LocalBackend::new(
 LocalUbootConfig {
 board_reset_cmd: Some("legacy-reset".into()),
 board_power_off_cmd: Some("legacy-power-off".into()),
 ..Default::default()
 },
 None,
 None,
 );

 assert_eq!(backend.reset_cmd.as_deref(), Some("legacy-reset"));
 assert_eq!(backend.power_off_cmd.as_deref(), Some("legacy-power-off"));
 }

 #[test]
 fn uboot_config_replaces_string_fields() {
 let tmp = tempfile::tempdir().unwrap();
Expand DownExpand Up@@ -2460,6 +2530,8 @@ interface = "eth0"
 kernel_load_addr: Some("${workspaceFolder}".into()),
 fit_load_addr: Some("${package}".into()),
 bootm_addr: Some("${workspace}".into()),
 board_reset_cmd: Some("${workspace}".into()),
 board_power_off_cmd: Some("${package}".into()),
 fail_regex: vec!["${package}".into()],
 uboot_cmd: Some(vec!["setenv boot ${workspace}".into()]),
 shell_check_steps: vec![ShellCheckStep {
Expand All@@ -2471,15 +2543,14 @@ interface = "eth0"
 local: LocalUbootConfig {
 serial: Some("${workspace}/tty".into()),
 baud_rate: Some("${env:OSTOOL_UBOOT_TEST_ENV}".into()),
 board_reset_cmd: Some("${workspace}".into()),
 board_power_off_cmd: Some("${package}".into()),
 net: Some(Net {
 interface: "${env:OSTOOL_UBOOT_TEST_ENV}".into(),
 board_ip: Some("${workspace}".into()),
 gatewayip: Some("${package}".into()),
 netmask: Some("${workspaceFolder}".into()),
 tftp_dir: Some("${package}/tftp".into()),
 }),
 ..Default::default()
 },
 ..Default::default()
 };
Expand All@@ -2501,12 +2572,9 @@ interface = "eth0"
 assert_eq!(config.kernel_load_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.fit_load_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.bootm_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.board_reset_cmd.as_deref(), Some(expected.as_str()));
 assert_eq!(
 config.local.board_reset_cmd.as_deref(),
 Some(expected.as_str())
 );
 assert_eq!(
 config.local.board_power_off_cmd.as_deref(),
 config.board_power_off_cmd.as_deref(),
 Some(expected.as_str())
 );
 assert_eq!(config.fail_regex, vec![expected.clone()]);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config by yfblock · Pull Request #172 · drivercraft/ostool · GitHub
Skip to content
fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config#172

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

yfblock
wants to merge
1
commit into

base:main
Choose a base branch

from


+94

−26

 Open


fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config
#172
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


10 changes: 5 additions & 5 deletions
README.en.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -270,11 +270,6 @@ dtb_file = "tools/device_tree.dtb"
# Kernel load address (optional)
kernel_load_addr = "0x80080000"

# Network boot configuration (optional)
[net]
interface = "eth0"
board_ip = "192.168.1.100"

# Board reset command (optional)
board_reset_cmd = "reset"

Expand All@@ -283,6 +278,11 @@ board_power_off_cmd = "poweroff"

# Failure boot regex patterns
fail_regex = ["Boot failed", "Error loading kernel"]

# Network boot configuration (optional)
[net]
interface = "eth0"
board_ip = "192.168.1.100"
```

### Ordered shell initialization steps
Expand Down

10 changes: 5 additions & 5 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -267,11 +267,6 @@ dtb_file = "tools/device_tree.dtb"
# 内核加载地址（可选）
kernel_load_addr = "0x80080000"

# 网络启动配置（可选）
[net]
interface = "eth0"
board_ip = "192.168.1.100"

# 板子重置命令（可选）
board_reset_cmd = "reset"

Expand All@@ -280,6 +275,11 @@ board_power_off_cmd = "poweroff"

# 失败启动的正则表达式
fail_regex = ["Boot failed", "Error loading kernel"]

# 网络启动配置（可选）
[net]
interface = "eth0"
board_ip = "192.168.1.100"
```

### 有序 Shell 初始化步骤
Expand Down

100 changes: 84 additions & 16 deletions
ostool/src/run/uboot.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,11 +160,13 @@ pub struct LocalUbootConfig {
 pub baud_rate: Option<String>,
 /// TFTP boot configuration
 pub net: Option<Net>,
 /// Board reset command
 /// shell command to reset the board
 /// Legacy Rust API compatibility field. Use `UbootConfig::board_reset_cmd`.
 #[serde(skip)]
 #[schemars(skip)]
 pub board_reset_cmd: Option<String>,
 /// Board power off command
 /// shell command to power off the board
 /// Legacy Rust API compatibility field. Use `UbootConfig::board_power_off_cmd`.
 #[serde(skip)]
 #[schemars(skip)]
 pub board_power_off_cmd: Option<String>,
}

Expand DownExpand Up@@ -451,7 +453,11 @@ pub(crate) async fn run_uboot_with_config(
 input: UbootRunInput,
 config: UbootConfig,
) -> anyhow::Result<()> {
 let backend = LocalBackend::new(config.local.clone());
 let backend = LocalBackend::new(
 config.local.clone(),
 config.board_reset_cmd.clone(),
 config.board_power_off_cmd.clone(),
 );
 let mut runner = Runner::new(input, config, backend);
 runner.run().await
}
Expand DownExpand Up@@ -591,6 +597,10 @@ trait RunnerBackend {

struct LocalBackend {
 config: LocalUbootConfig,
 /// Host-side reset command, taken from `UbootConfig::board_reset_cmd`.
 reset_cmd: Option<String>,
 /// Host-side power-off command, taken from `UbootConfig::board_power_off_cmd`.
 power_off_cmd: Option<String>,
 baud_rate: Option<u32>,
 linux_system_tftp: Option<tftp::TftpdHpaConfig>,
 linux_tftp_staging: Vec<tftp::LinuxTftpPrepared>,
Expand All@@ -599,9 +609,17 @@ struct LocalBackend {
}

impl LocalBackend {
 fn new(config: LocalUbootConfig) -> Self {
 fn new(
 config: LocalUbootConfig,
 reset_cmd: Option<String>,
 power_off_cmd: Option<String>,
 ) -> Self {
 let reset_cmd = reset_cmd.or_else(|| config.board_reset_cmd.clone());
 let power_off_cmd = power_off_cmd.or_else(|| config.board_power_off_cmd.clone());
 Self {
 config,
 reset_cmd,
 power_off_cmd,
 baud_rate: None,
 linux_system_tftp: None,
 linux_tftp_staging: Vec::new(),
Expand DownExpand Up@@ -746,7 +764,7 @@ impl RunnerBackend for LocalBackend {

 async fn after_console_open(&mut self, context: &ProcessContext) -> anyhow::Result<()> {
 println!("Waiting for board on power or reset...");
 if let Some(cmd) = self.config.board_reset_cmd.as_deref()
 if let Some(cmd) = self.reset_cmd.as_deref()
 && !cmd.trim().is_empty()
 {
 crate::process::shell_run_cmd(context, cmd)?;
Expand DownExpand Up@@ -805,7 +823,7 @@ impl RunnerBackend for LocalBackend {
 }
 }

 if let Some(cmd) = self.config.board_power_off_cmd.as_deref()
 if let Some(cmd) = self.power_off_cmd.as_deref()
 && !cmd.trim().is_empty()
 && let Err(err) = crate::process::shell_run_cmd(context, cmd)
 {
Expand DownExpand Up@@ -1642,6 +1660,8 @@ mod tests {
 fn local_backend() -> LocalBackend {
 LocalBackend {
 config: LocalUbootConfig::default(),
 reset_cmd: None,
 power_off_cmd: None,
 baud_rate: None,
 linux_system_tftp: None,
 linux_tftp_staging: Vec::new(),
Expand DownExpand Up@@ -2278,7 +2298,7 @@ mod tests {
 std::fs::write(prepared.target_dir().join("keep.txt"), b"keep").unwrap();
 let marker = temp.path().join("powered-off");
 let mut backend = local_backend();
 backend.config.board_power_off_cmd = Some(format!("touch {}", marker.display()));
 backend.power_off_cmd = Some(format!("touch {}", marker.display()));
 backend.linux_tftp_staging.push(prepared);

 let context = make_invocation(temp.path()).process_context().unwrap();
Expand DownExpand Up@@ -2416,6 +2436,56 @@ interface = "eth0"
 assert_eq!(net.interface, "eth0");
 }

 #[test]
 fn uboot_config_parses_board_commands_at_top_level() {
 let config: UbootConfig = toml::from_str(
 r#"
serial = "/dev/null"
baud_rate = "115200"
fail_regex = []
board_reset_cmd = "reset-board"
board_power_off_cmd = "power-off-board"
"#,
 )
 .unwrap();

 assert_eq!(config.board_reset_cmd.as_deref(), Some("reset-board"));
 assert_eq!(
 config.board_power_off_cmd.as_deref(),
 Some("power-off-board")
 );
 assert_eq!(config.local.board_reset_cmd, None);
 assert_eq!(config.local.board_power_off_cmd, None);

 let serialized = toml::to_string(&config).unwrap();
 assert_eq!(serialized.matches("board_reset_cmd").count(), 1);
 assert_eq!(serialized.matches("board_power_off_cmd").count(), 1);

 let backend = LocalBackend::new(
 config.local,
 config.board_reset_cmd,
 config.board_power_off_cmd,
 );
 assert_eq!(backend.reset_cmd.as_deref(), Some("reset-board"));
 assert_eq!(backend.power_off_cmd.as_deref(), Some("power-off-board"));
 }

 #[test]
 fn local_backend_keeps_legacy_command_fields_usable() {
 let backend = LocalBackend::new(
 LocalUbootConfig {
 board_reset_cmd: Some("legacy-reset".into()),
 board_power_off_cmd: Some("legacy-power-off".into()),
 ..Default::default()
 },
 None,
 None,
 );

 assert_eq!(backend.reset_cmd.as_deref(), Some("legacy-reset"));
 assert_eq!(backend.power_off_cmd.as_deref(), Some("legacy-power-off"));
 }

 #[test]
 fn uboot_config_replaces_string_fields() {
 let tmp = tempfile::tempdir().unwrap();
Expand DownExpand Up@@ -2460,6 +2530,8 @@ interface = "eth0"
 kernel_load_addr: Some("${workspaceFolder}".into()),
 fit_load_addr: Some("${package}".into()),
 bootm_addr: Some("${workspace}".into()),
 board_reset_cmd: Some("${workspace}".into()),
 board_power_off_cmd: Some("${package}".into()),
 fail_regex: vec!["${package}".into()],
 uboot_cmd: Some(vec!["setenv boot ${workspace}".into()]),
 shell_check_steps: vec![ShellCheckStep {
Expand All@@ -2471,15 +2543,14 @@ interface = "eth0"
 local: LocalUbootConfig {
 serial: Some("${workspace}/tty".into()),
 baud_rate: Some("${env:OSTOOL_UBOOT_TEST_ENV}".into()),
 board_reset_cmd: Some("${workspace}".into()),
 board_power_off_cmd: Some("${package}".into()),
 net: Some(Net {
 interface: "${env:OSTOOL_UBOOT_TEST_ENV}".into(),
 board_ip: Some("${workspace}".into()),
 gatewayip: Some("${package}".into()),
 netmask: Some("${workspaceFolder}".into()),
 tftp_dir: Some("${package}/tftp".into()),
 }),
 ..Default::default()
 },
 ..Default::default()
 };
Expand All@@ -2501,12 +2572,9 @@ interface = "eth0"
 assert_eq!(config.kernel_load_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.fit_load_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.bootm_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.board_reset_cmd.as_deref(), Some(expected.as_str()));
 assert_eq!(
 config.local.board_reset_cmd.as_deref(),
 Some(expected.as_str())
 );
 assert_eq!(
 config.local.board_power_off_cmd.as_deref(),
 config.board_power_off_cmd.as_deref(),
 Some(expected.as_str())
 );
 assert_eq!(config.fail_regex, vec![expected.clone()]);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config by yfblock · Pull Request #172 · drivercraft/ostool · GitHub
Skip to content
fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config#172

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

yfblock
wants to merge
1
commit into

base:main
Choose a base branch

from


+94

−26

 Open


fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config
#172
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


10 changes: 5 additions & 5 deletions
README.en.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -270,11 +270,6 @@ dtb_file = "tools/device_tree.dtb"
# Kernel load address (optional)
kernel_load_addr = "0x80080000"

# Network boot configuration (optional)
[net]
interface = "eth0"
board_ip = "192.168.1.100"

# Board reset command (optional)
board_reset_cmd = "reset"

Expand All@@ -283,6 +278,11 @@ board_power_off_cmd = "poweroff"

# Failure boot regex patterns
fail_regex = ["Boot failed", "Error loading kernel"]

# Network boot configuration (optional)
[net]
interface = "eth0"
board_ip = "192.168.1.100"
```

### Ordered shell initialization steps
Expand Down

10 changes: 5 additions & 5 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -267,11 +267,6 @@ dtb_file = "tools/device_tree.dtb"
# 内核加载地址（可选）
kernel_load_addr = "0x80080000"

# 网络启动配置（可选）
[net]
interface = "eth0"
board_ip = "192.168.1.100"

# 板子重置命令（可选）
board_reset_cmd = "reset"

Expand All@@ -280,6 +275,11 @@ board_power_off_cmd = "poweroff"

# 失败启动的正则表达式
fail_regex = ["Boot failed", "Error loading kernel"]

# 网络启动配置（可选）
[net]
interface = "eth0"
board_ip = "192.168.1.100"
```

### 有序 Shell 初始化步骤
Expand Down

100 changes: 84 additions & 16 deletions
ostool/src/run/uboot.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,11 +160,13 @@ pub struct LocalUbootConfig {
 pub baud_rate: Option<String>,
 /// TFTP boot configuration
 pub net: Option<Net>,
 /// Board reset command
 /// shell command to reset the board
 /// Legacy Rust API compatibility field. Use `UbootConfig::board_reset_cmd`.
 #[serde(skip)]
 #[schemars(skip)]
 pub board_reset_cmd: Option<String>,
 /// Board power off command
 /// shell command to power off the board
 /// Legacy Rust API compatibility field. Use `UbootConfig::board_power_off_cmd`.
 #[serde(skip)]
 #[schemars(skip)]
 pub board_power_off_cmd: Option<String>,
}

Expand DownExpand Up@@ -451,7 +453,11 @@ pub(crate) async fn run_uboot_with_config(
 input: UbootRunInput,
 config: UbootConfig,
) -> anyhow::Result<()> {
 let backend = LocalBackend::new(config.local.clone());
 let backend = LocalBackend::new(
 config.local.clone(),
 config.board_reset_cmd.clone(),
 config.board_power_off_cmd.clone(),
 );
 let mut runner = Runner::new(input, config, backend);
 runner.run().await
}
Expand DownExpand Up@@ -591,6 +597,10 @@ trait RunnerBackend {

struct LocalBackend {
 config: LocalUbootConfig,
 /// Host-side reset command, taken from `UbootConfig::board_reset_cmd`.
 reset_cmd: Option<String>,
 /// Host-side power-off command, taken from `UbootConfig::board_power_off_cmd`.
 power_off_cmd: Option<String>,
 baud_rate: Option<u32>,
 linux_system_tftp: Option<tftp::TftpdHpaConfig>,
 linux_tftp_staging: Vec<tftp::LinuxTftpPrepared>,
Expand All@@ -599,9 +609,17 @@ struct LocalBackend {
}

impl LocalBackend {
 fn new(config: LocalUbootConfig) -> Self {
 fn new(
 config: LocalUbootConfig,
 reset_cmd: Option<String>,
 power_off_cmd: Option<String>,
 ) -> Self {
 let reset_cmd = reset_cmd.or_else(|| config.board_reset_cmd.clone());
 let power_off_cmd = power_off_cmd.or_else(|| config.board_power_off_cmd.clone());
 Self {
 config,
 reset_cmd,
 power_off_cmd,
 baud_rate: None,
 linux_system_tftp: None,
 linux_tftp_staging: Vec::new(),
Expand DownExpand Up@@ -746,7 +764,7 @@ impl RunnerBackend for LocalBackend {

 async fn after_console_open(&mut self, context: &ProcessContext) -> anyhow::Result<()> {
 println!("Waiting for board on power or reset...");
 if let Some(cmd) = self.config.board_reset_cmd.as_deref()
 if let Some(cmd) = self.reset_cmd.as_deref()
 && !cmd.trim().is_empty()
 {
 crate::process::shell_run_cmd(context, cmd)?;
Expand DownExpand Up@@ -805,7 +823,7 @@ impl RunnerBackend for LocalBackend {
 }
 }

 if let Some(cmd) = self.config.board_power_off_cmd.as_deref()
 if let Some(cmd) = self.power_off_cmd.as_deref()
 && !cmd.trim().is_empty()
 && let Err(err) = crate::process::shell_run_cmd(context, cmd)
 {
Expand DownExpand Up@@ -1642,6 +1660,8 @@ mod tests {
 fn local_backend() -> LocalBackend {
 LocalBackend {
 config: LocalUbootConfig::default(),
 reset_cmd: None,
 power_off_cmd: None,
 baud_rate: None,
 linux_system_tftp: None,
 linux_tftp_staging: Vec::new(),
Expand DownExpand Up@@ -2278,7 +2298,7 @@ mod tests {
 std::fs::write(prepared.target_dir().join("keep.txt"), b"keep").unwrap();
 let marker = temp.path().join("powered-off");
 let mut backend = local_backend();
 backend.config.board_power_off_cmd = Some(format!("touch {}", marker.display()));
 backend.power_off_cmd = Some(format!("touch {}", marker.display()));
 backend.linux_tftp_staging.push(prepared);

 let context = make_invocation(temp.path()).process_context().unwrap();
Expand DownExpand Up@@ -2416,6 +2436,56 @@ interface = "eth0"
 assert_eq!(net.interface, "eth0");
 }

 #[test]
 fn uboot_config_parses_board_commands_at_top_level() {
 let config: UbootConfig = toml::from_str(
 r#"
serial = "/dev/null"
baud_rate = "115200"
fail_regex = []
board_reset_cmd = "reset-board"
board_power_off_cmd = "power-off-board"
"#,
 )
 .unwrap();

 assert_eq!(config.board_reset_cmd.as_deref(), Some("reset-board"));
 assert_eq!(
 config.board_power_off_cmd.as_deref(),
 Some("power-off-board")
 );
 assert_eq!(config.local.board_reset_cmd, None);
 assert_eq!(config.local.board_power_off_cmd, None);

 let serialized = toml::to_string(&config).unwrap();
 assert_eq!(serialized.matches("board_reset_cmd").count(), 1);
 assert_eq!(serialized.matches("board_power_off_cmd").count(), 1);

 let backend = LocalBackend::new(
 config.local,
 config.board_reset_cmd,
 config.board_power_off_cmd,
 );
 assert_eq!(backend.reset_cmd.as_deref(), Some("reset-board"));
 assert_eq!(backend.power_off_cmd.as_deref(), Some("power-off-board"));
 }

 #[test]
 fn local_backend_keeps_legacy_command_fields_usable() {
 let backend = LocalBackend::new(
 LocalUbootConfig {
 board_reset_cmd: Some("legacy-reset".into()),
 board_power_off_cmd: Some("legacy-power-off".into()),
 ..Default::default()
 },
 None,
 None,
 );

 assert_eq!(backend.reset_cmd.as_deref(), Some("legacy-reset"));
 assert_eq!(backend.power_off_cmd.as_deref(), Some("legacy-power-off"));
 }

 #[test]
 fn uboot_config_replaces_string_fields() {
 let tmp = tempfile::tempdir().unwrap();
Expand DownExpand Up@@ -2460,6 +2530,8 @@ interface = "eth0"
 kernel_load_addr: Some("${workspaceFolder}".into()),
 fit_load_addr: Some("${package}".into()),
 bootm_addr: Some("${workspace}".into()),
 board_reset_cmd: Some("${workspace}".into()),
 board_power_off_cmd: Some("${package}".into()),
 fail_regex: vec!["${package}".into()],
 uboot_cmd: Some(vec!["setenv boot ${workspace}".into()]),
 shell_check_steps: vec![ShellCheckStep {
Expand All@@ -2471,15 +2543,14 @@ interface = "eth0"
 local: LocalUbootConfig {
 serial: Some("${workspace}/tty".into()),
 baud_rate: Some("${env:OSTOOL_UBOOT_TEST_ENV}".into()),
 board_reset_cmd: Some("${workspace}".into()),
 board_power_off_cmd: Some("${package}".into()),
 net: Some(Net {
 interface: "${env:OSTOOL_UBOOT_TEST_ENV}".into(),
 board_ip: Some("${workspace}".into()),
 gatewayip: Some("${package}".into()),
 netmask: Some("${workspaceFolder}".into()),
 tftp_dir: Some("${package}/tftp".into()),
 }),
 ..Default::default()
 },
 ..Default::default()
 };
Expand All@@ -2501,12 +2572,9 @@ interface = "eth0"
 assert_eq!(config.kernel_load_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.fit_load_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.bootm_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.board_reset_cmd.as_deref(), Some(expected.as_str()));
 assert_eq!(
 config.local.board_reset_cmd.as_deref(),
 Some(expected.as_str())
 );
 assert_eq!(
 config.local.board_power_off_cmd.as_deref(),
 config.board_power_off_cmd.as_deref(),
 Some(expected.as_str())
 );
 assert_eq!(config.fail_regex, vec![expected.clone()]);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config by yfblock · Pull Request #172 · drivercraft/ostool · GitHub
Skip to content
fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config#172

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

yfblock
wants to merge
1
commit into

base:main
Choose a base branch

from


+94

−26

 Open


fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config
#172
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


10 changes: 5 additions & 5 deletions
README.en.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -270,11 +270,6 @@ dtb_file = "tools/device_tree.dtb"
# Kernel load address (optional)
kernel_load_addr = "0x80080000"

# Network boot configuration (optional)
[net]
interface = "eth0"
board_ip = "192.168.1.100"

# Board reset command (optional)
board_reset_cmd = "reset"

Expand All@@ -283,6 +278,11 @@ board_power_off_cmd = "poweroff"

# Failure boot regex patterns
fail_regex = ["Boot failed", "Error loading kernel"]

# Network boot configuration (optional)
[net]
interface = "eth0"
board_ip = "192.168.1.100"
```

### Ordered shell initialization steps
Expand Down

10 changes: 5 additions & 5 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -267,11 +267,6 @@ dtb_file = "tools/device_tree.dtb"
# 内核加载地址（可选）
kernel_load_addr = "0x80080000"

# 网络启动配置（可选）
[net]
interface = "eth0"
board_ip = "192.168.1.100"

# 板子重置命令（可选）
board_reset_cmd = "reset"

Expand All@@ -280,6 +275,11 @@ board_power_off_cmd = "poweroff"

# 失败启动的正则表达式
fail_regex = ["Boot failed", "Error loading kernel"]

# 网络启动配置（可选）
[net]
interface = "eth0"
board_ip = "192.168.1.100"
```

### 有序 Shell 初始化步骤
Expand Down

100 changes: 84 additions & 16 deletions
ostool/src/run/uboot.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,11 +160,13 @@ pub struct LocalUbootConfig {
 pub baud_rate: Option<String>,
 /// TFTP boot configuration
 pub net: Option<Net>,
 /// Board reset command
 /// shell command to reset the board
 /// Legacy Rust API compatibility field. Use `UbootConfig::board_reset_cmd`.
 #[serde(skip)]
 #[schemars(skip)]
 pub board_reset_cmd: Option<String>,
 /// Board power off command
 /// shell command to power off the board
 /// Legacy Rust API compatibility field. Use `UbootConfig::board_power_off_cmd`.
 #[serde(skip)]
 #[schemars(skip)]
 pub board_power_off_cmd: Option<String>,
}

Expand DownExpand Up@@ -451,7 +453,11 @@ pub(crate) async fn run_uboot_with_config(
 input: UbootRunInput,
 config: UbootConfig,
) -> anyhow::Result<()> {
 let backend = LocalBackend::new(config.local.clone());
 let backend = LocalBackend::new(
 config.local.clone(),
 config.board_reset_cmd.clone(),
 config.board_power_off_cmd.clone(),
 );
 let mut runner = Runner::new(input, config, backend);
 runner.run().await
}
Expand DownExpand Up@@ -591,6 +597,10 @@ trait RunnerBackend {

struct LocalBackend {
 config: LocalUbootConfig,
 /// Host-side reset command, taken from `UbootConfig::board_reset_cmd`.
 reset_cmd: Option<String>,
 /// Host-side power-off command, taken from `UbootConfig::board_power_off_cmd`.
 power_off_cmd: Option<String>,
 baud_rate: Option<u32>,
 linux_system_tftp: Option<tftp::TftpdHpaConfig>,
 linux_tftp_staging: Vec<tftp::LinuxTftpPrepared>,
Expand All@@ -599,9 +609,17 @@ struct LocalBackend {
}

impl LocalBackend {
 fn new(config: LocalUbootConfig) -> Self {
 fn new(
 config: LocalUbootConfig,
 reset_cmd: Option<String>,
 power_off_cmd: Option<String>,
 ) -> Self {
 let reset_cmd = reset_cmd.or_else(|| config.board_reset_cmd.clone());
 let power_off_cmd = power_off_cmd.or_else(|| config.board_power_off_cmd.clone());
 Self {
 config,
 reset_cmd,
 power_off_cmd,
 baud_rate: None,
 linux_system_tftp: None,
 linux_tftp_staging: Vec::new(),
Expand DownExpand Up@@ -746,7 +764,7 @@ impl RunnerBackend for LocalBackend {

 async fn after_console_open(&mut self, context: &ProcessContext) -> anyhow::Result<()> {
 println!("Waiting for board on power or reset...");
 if let Some(cmd) = self.config.board_reset_cmd.as_deref()
 if let Some(cmd) = self.reset_cmd.as_deref()
 && !cmd.trim().is_empty()
 {
 crate::process::shell_run_cmd(context, cmd)?;
Expand DownExpand Up@@ -805,7 +823,7 @@ impl RunnerBackend for LocalBackend {
 }
 }

 if let Some(cmd) = self.config.board_power_off_cmd.as_deref()
 if let Some(cmd) = self.power_off_cmd.as_deref()
 && !cmd.trim().is_empty()
 && let Err(err) = crate::process::shell_run_cmd(context, cmd)
 {
Expand DownExpand Up@@ -1642,6 +1660,8 @@ mod tests {
 fn local_backend() -> LocalBackend {
 LocalBackend {
 config: LocalUbootConfig::default(),
 reset_cmd: None,
 power_off_cmd: None,
 baud_rate: None,
 linux_system_tftp: None,
 linux_tftp_staging: Vec::new(),
Expand DownExpand Up@@ -2278,7 +2298,7 @@ mod tests {
 std::fs::write(prepared.target_dir().join("keep.txt"), b"keep").unwrap();
 let marker = temp.path().join("powered-off");
 let mut backend = local_backend();
 backend.config.board_power_off_cmd = Some(format!("touch {}", marker.display()));
 backend.power_off_cmd = Some(format!("touch {}", marker.display()));
 backend.linux_tftp_staging.push(prepared);

 let context = make_invocation(temp.path()).process_context().unwrap();
Expand DownExpand Up@@ -2416,6 +2436,56 @@ interface = "eth0"
 assert_eq!(net.interface, "eth0");
 }

 #[test]
 fn uboot_config_parses_board_commands_at_top_level() {
 let config: UbootConfig = toml::from_str(
 r#"
serial = "/dev/null"
baud_rate = "115200"
fail_regex = []
board_reset_cmd = "reset-board"
board_power_off_cmd = "power-off-board"
"#,
 )
 .unwrap();

 assert_eq!(config.board_reset_cmd.as_deref(), Some("reset-board"));
 assert_eq!(
 config.board_power_off_cmd.as_deref(),
 Some("power-off-board")
 );
 assert_eq!(config.local.board_reset_cmd, None);
 assert_eq!(config.local.board_power_off_cmd, None);

 let serialized = toml::to_string(&config).unwrap();
 assert_eq!(serialized.matches("board_reset_cmd").count(), 1);
 assert_eq!(serialized.matches("board_power_off_cmd").count(), 1);

 let backend = LocalBackend::new(
 config.local,
 config.board_reset_cmd,
 config.board_power_off_cmd,
 );
 assert_eq!(backend.reset_cmd.as_deref(), Some("reset-board"));
 assert_eq!(backend.power_off_cmd.as_deref(), Some("power-off-board"));
 }

 #[test]
 fn local_backend_keeps_legacy_command_fields_usable() {
 let backend = LocalBackend::new(
 LocalUbootConfig {
 board_reset_cmd: Some("legacy-reset".into()),
 board_power_off_cmd: Some("legacy-power-off".into()),
 ..Default::default()
 },
 None,
 None,
 );

 assert_eq!(backend.reset_cmd.as_deref(), Some("legacy-reset"));
 assert_eq!(backend.power_off_cmd.as_deref(), Some("legacy-power-off"));
 }

 #[test]
 fn uboot_config_replaces_string_fields() {
 let tmp = tempfile::tempdir().unwrap();
Expand DownExpand Up@@ -2460,6 +2530,8 @@ interface = "eth0"
 kernel_load_addr: Some("${workspaceFolder}".into()),
 fit_load_addr: Some("${package}".into()),
 bootm_addr: Some("${workspace}".into()),
 board_reset_cmd: Some("${workspace}".into()),
 board_power_off_cmd: Some("${package}".into()),
 fail_regex: vec!["${package}".into()],
 uboot_cmd: Some(vec!["setenv boot ${workspace}".into()]),
 shell_check_steps: vec![ShellCheckStep {
Expand All@@ -2471,15 +2543,14 @@ interface = "eth0"
 local: LocalUbootConfig {
 serial: Some("${workspace}/tty".into()),
 baud_rate: Some("${env:OSTOOL_UBOOT_TEST_ENV}".into()),
 board_reset_cmd: Some("${workspace}".into()),
 board_power_off_cmd: Some("${package}".into()),
 net: Some(Net {
 interface: "${env:OSTOOL_UBOOT_TEST_ENV}".into(),
 board_ip: Some("${workspace}".into()),
 gatewayip: Some("${package}".into()),
 netmask: Some("${workspaceFolder}".into()),
 tftp_dir: Some("${package}/tftp".into()),
 }),
 ..Default::default()
 },
 ..Default::default()
 };
Expand All@@ -2501,12 +2572,9 @@ interface = "eth0"
 assert_eq!(config.kernel_load_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.fit_load_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.bootm_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.board_reset_cmd.as_deref(), Some(expected.as_str()));
 assert_eq!(
 config.local.board_reset_cmd.as_deref(),
 Some(expected.as_str())
 );
 assert_eq!(
 config.local.board_power_off_cmd.as_deref(),
 config.board_power_off_cmd.as_deref(),
 Some(expected.as_str())
 );
 assert_eq!(config.fail_regex, vec![expected.clone()]);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config by yfblock · Pull Request #172 · drivercraft/ostool · GitHub
Skip to content
fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config#172

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

yfblock
wants to merge
1
commit into

base:main
Choose a base branch

from


+94

−26

 Open


fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config
#172
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


10 changes: 5 additions & 5 deletions
README.en.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -270,11 +270,6 @@ dtb_file = "tools/device_tree.dtb"
# Kernel load address (optional)
kernel_load_addr = "0x80080000"

# Network boot configuration (optional)
[net]
interface = "eth0"
board_ip = "192.168.1.100"

# Board reset command (optional)
board_reset_cmd = "reset"

Expand All@@ -283,6 +278,11 @@ board_power_off_cmd = "poweroff"

# Failure boot regex patterns
fail_regex = ["Boot failed", "Error loading kernel"]

# Network boot configuration (optional)
[net]
interface = "eth0"
board_ip = "192.168.1.100"
```

### Ordered shell initialization steps
Expand Down

10 changes: 5 additions & 5 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -267,11 +267,6 @@ dtb_file = "tools/device_tree.dtb"
# 内核加载地址（可选）
kernel_load_addr = "0x80080000"

# 网络启动配置（可选）
[net]
interface = "eth0"
board_ip = "192.168.1.100"

# 板子重置命令（可选）
board_reset_cmd = "reset"

Expand All@@ -280,6 +275,11 @@ board_power_off_cmd = "poweroff"

# 失败启动的正则表达式
fail_regex = ["Boot failed", "Error loading kernel"]

# 网络启动配置（可选）
[net]
interface = "eth0"
board_ip = "192.168.1.100"
```

### 有序 Shell 初始化步骤
Expand Down

100 changes: 84 additions & 16 deletions
ostool/src/run/uboot.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,11 +160,13 @@ pub struct LocalUbootConfig {
 pub baud_rate: Option<String>,
 /// TFTP boot configuration
 pub net: Option<Net>,
 /// Board reset command
 /// shell command to reset the board
 /// Legacy Rust API compatibility field. Use `UbootConfig::board_reset_cmd`.
 #[serde(skip)]
 #[schemars(skip)]
 pub board_reset_cmd: Option<String>,
 /// Board power off command
 /// shell command to power off the board
 /// Legacy Rust API compatibility field. Use `UbootConfig::board_power_off_cmd`.
 #[serde(skip)]
 #[schemars(skip)]
 pub board_power_off_cmd: Option<String>,
}

Expand DownExpand Up@@ -451,7 +453,11 @@ pub(crate) async fn run_uboot_with_config(
 input: UbootRunInput,
 config: UbootConfig,
) -> anyhow::Result<()> {
 let backend = LocalBackend::new(config.local.clone());
 let backend = LocalBackend::new(
 config.local.clone(),
 config.board_reset_cmd.clone(),
 config.board_power_off_cmd.clone(),
 );
 let mut runner = Runner::new(input, config, backend);
 runner.run().await
}
Expand DownExpand Up@@ -591,6 +597,10 @@ trait RunnerBackend {

struct LocalBackend {
 config: LocalUbootConfig,
 /// Host-side reset command, taken from `UbootConfig::board_reset_cmd`.
 reset_cmd: Option<String>,
 /// Host-side power-off command, taken from `UbootConfig::board_power_off_cmd`.
 power_off_cmd: Option<String>,
 baud_rate: Option<u32>,
 linux_system_tftp: Option<tftp::TftpdHpaConfig>,
 linux_tftp_staging: Vec<tftp::LinuxTftpPrepared>,
Expand All@@ -599,9 +609,17 @@ struct LocalBackend {
}

impl LocalBackend {
 fn new(config: LocalUbootConfig) -> Self {
 fn new(
 config: LocalUbootConfig,
 reset_cmd: Option<String>,
 power_off_cmd: Option<String>,
 ) -> Self {
 let reset_cmd = reset_cmd.or_else(|| config.board_reset_cmd.clone());
 let power_off_cmd = power_off_cmd.or_else(|| config.board_power_off_cmd.clone());
 Self {
 config,
 reset_cmd,
 power_off_cmd,
 baud_rate: None,
 linux_system_tftp: None,
 linux_tftp_staging: Vec::new(),
Expand DownExpand Up@@ -746,7 +764,7 @@ impl RunnerBackend for LocalBackend {

 async fn after_console_open(&mut self, context: &ProcessContext) -> anyhow::Result<()> {
 println!("Waiting for board on power or reset...");
 if let Some(cmd) = self.config.board_reset_cmd.as_deref()
 if let Some(cmd) = self.reset_cmd.as_deref()
 && !cmd.trim().is_empty()
 {
 crate::process::shell_run_cmd(context, cmd)?;
Expand DownExpand Up@@ -805,7 +823,7 @@ impl RunnerBackend for LocalBackend {
 }
 }

 if let Some(cmd) = self.config.board_power_off_cmd.as_deref()
 if let Some(cmd) = self.power_off_cmd.as_deref()
 && !cmd.trim().is_empty()
 && let Err(err) = crate::process::shell_run_cmd(context, cmd)
 {
Expand DownExpand Up@@ -1642,6 +1660,8 @@ mod tests {
 fn local_backend() -> LocalBackend {
 LocalBackend {
 config: LocalUbootConfig::default(),
 reset_cmd: None,
 power_off_cmd: None,
 baud_rate: None,
 linux_system_tftp: None,
 linux_tftp_staging: Vec::new(),
Expand DownExpand Up@@ -2278,7 +2298,7 @@ mod tests {
 std::fs::write(prepared.target_dir().join("keep.txt"), b"keep").unwrap();
 let marker = temp.path().join("powered-off");
 let mut backend = local_backend();
 backend.config.board_power_off_cmd = Some(format!("touch {}", marker.display()));
 backend.power_off_cmd = Some(format!("touch {}", marker.display()));
 backend.linux_tftp_staging.push(prepared);

 let context = make_invocation(temp.path()).process_context().unwrap();
Expand DownExpand Up@@ -2416,6 +2436,56 @@ interface = "eth0"
 assert_eq!(net.interface, "eth0");
 }

 #[test]
 fn uboot_config_parses_board_commands_at_top_level() {
 let config: UbootConfig = toml::from_str(
 r#"
serial = "/dev/null"
baud_rate = "115200"
fail_regex = []
board_reset_cmd = "reset-board"
board_power_off_cmd = "power-off-board"
"#,
 )
 .unwrap();

 assert_eq!(config.board_reset_cmd.as_deref(), Some("reset-board"));
 assert_eq!(
 config.board_power_off_cmd.as_deref(),
 Some("power-off-board")
 );
 assert_eq!(config.local.board_reset_cmd, None);
 assert_eq!(config.local.board_power_off_cmd, None);

 let serialized = toml::to_string(&config).unwrap();
 assert_eq!(serialized.matches("board_reset_cmd").count(), 1);
 assert_eq!(serialized.matches("board_power_off_cmd").count(), 1);

 let backend = LocalBackend::new(
 config.local,
 config.board_reset_cmd,
 config.board_power_off_cmd,
 );
 assert_eq!(backend.reset_cmd.as_deref(), Some("reset-board"));
 assert_eq!(backend.power_off_cmd.as_deref(), Some("power-off-board"));
 }

 #[test]
 fn local_backend_keeps_legacy_command_fields_usable() {
 let backend = LocalBackend::new(
 LocalUbootConfig {
 board_reset_cmd: Some("legacy-reset".into()),
 board_power_off_cmd: Some("legacy-power-off".into()),
 ..Default::default()
 },
 None,
 None,
 );

 assert_eq!(backend.reset_cmd.as_deref(), Some("legacy-reset"));
 assert_eq!(backend.power_off_cmd.as_deref(), Some("legacy-power-off"));
 }

 #[test]
 fn uboot_config_replaces_string_fields() {
 let tmp = tempfile::tempdir().unwrap();
Expand DownExpand Up@@ -2460,6 +2530,8 @@ interface = "eth0"
 kernel_load_addr: Some("${workspaceFolder}".into()),
 fit_load_addr: Some("${package}".into()),
 bootm_addr: Some("${workspace}".into()),
 board_reset_cmd: Some("${workspace}".into()),
 board_power_off_cmd: Some("${package}".into()),
 fail_regex: vec!["${package}".into()],
 uboot_cmd: Some(vec!["setenv boot ${workspace}".into()]),
 shell_check_steps: vec![ShellCheckStep {
Expand All@@ -2471,15 +2543,14 @@ interface = "eth0"
 local: LocalUbootConfig {
 serial: Some("${workspace}/tty".into()),
 baud_rate: Some("${env:OSTOOL_UBOOT_TEST_ENV}".into()),
 board_reset_cmd: Some("${workspace}".into()),
 board_power_off_cmd: Some("${package}".into()),
 net: Some(Net {
 interface: "${env:OSTOOL_UBOOT_TEST_ENV}".into(),
 board_ip: Some("${workspace}".into()),
 gatewayip: Some("${package}".into()),
 netmask: Some("${workspaceFolder}".into()),
 tftp_dir: Some("${package}/tftp".into()),
 }),
 ..Default::default()
 },
 ..Default::default()
 };
Expand All@@ -2501,12 +2572,9 @@ interface = "eth0"
 assert_eq!(config.kernel_load_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.fit_load_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.bootm_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.board_reset_cmd.as_deref(), Some(expected.as_str()));
 assert_eq!(
 config.local.board_reset_cmd.as_deref(),
 Some(expected.as_str())
 );
 assert_eq!(
 config.local.board_power_off_cmd.as_deref(),
 config.board_power_off_cmd.as_deref(),
 Some(expected.as_str())
 );
 assert_eq!(config.fail_regex, vec![expected.clone()]);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config by yfblock · Pull Request #172 · drivercraft/ostool · GitHub
Skip to content
fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config#172

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

yfblock
wants to merge
1
commit into

base:main
Choose a base branch

from


+94

−26

 Open


fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config
#172
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


10 changes: 5 additions & 5 deletions
README.en.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -270,11 +270,6 @@ dtb_file = "tools/device_tree.dtb"
# Kernel load address (optional)
kernel_load_addr = "0x80080000"

# Network boot configuration (optional)
[net]
interface = "eth0"
board_ip = "192.168.1.100"

# Board reset command (optional)
board_reset_cmd = "reset"

Expand All@@ -283,6 +278,11 @@ board_power_off_cmd = "poweroff"

# Failure boot regex patterns
fail_regex = ["Boot failed", "Error loading kernel"]

# Network boot configuration (optional)
[net]
interface = "eth0"
board_ip = "192.168.1.100"
```

### Ordered shell initialization steps
Expand Down

10 changes: 5 additions & 5 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -267,11 +267,6 @@ dtb_file = "tools/device_tree.dtb"
# 内核加载地址（可选）
kernel_load_addr = "0x80080000"

# 网络启动配置（可选）
[net]
interface = "eth0"
board_ip = "192.168.1.100"

# 板子重置命令（可选）
board_reset_cmd = "reset"

Expand All@@ -280,6 +275,11 @@ board_power_off_cmd = "poweroff"

# 失败启动的正则表达式
fail_regex = ["Boot failed", "Error loading kernel"]

# 网络启动配置（可选）
[net]
interface = "eth0"
board_ip = "192.168.1.100"
```

### 有序 Shell 初始化步骤
Expand Down

100 changes: 84 additions & 16 deletions
ostool/src/run/uboot.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,11 +160,13 @@ pub struct LocalUbootConfig {
 pub baud_rate: Option<String>,
 /// TFTP boot configuration
 pub net: Option<Net>,
 /// Board reset command
 /// shell command to reset the board
 /// Legacy Rust API compatibility field. Use `UbootConfig::board_reset_cmd`.
 #[serde(skip)]
 #[schemars(skip)]
 pub board_reset_cmd: Option<String>,
 /// Board power off command
 /// shell command to power off the board
 /// Legacy Rust API compatibility field. Use `UbootConfig::board_power_off_cmd`.
 #[serde(skip)]
 #[schemars(skip)]
 pub board_power_off_cmd: Option<String>,
}

Expand DownExpand Up@@ -451,7 +453,11 @@ pub(crate) async fn run_uboot_with_config(
 input: UbootRunInput,
 config: UbootConfig,
) -> anyhow::Result<()> {
 let backend = LocalBackend::new(config.local.clone());
 let backend = LocalBackend::new(
 config.local.clone(),
 config.board_reset_cmd.clone(),
 config.board_power_off_cmd.clone(),
 );
 let mut runner = Runner::new(input, config, backend);
 runner.run().await
}
Expand DownExpand Up@@ -591,6 +597,10 @@ trait RunnerBackend {

struct LocalBackend {
 config: LocalUbootConfig,
 /// Host-side reset command, taken from `UbootConfig::board_reset_cmd`.
 reset_cmd: Option<String>,
 /// Host-side power-off command, taken from `UbootConfig::board_power_off_cmd`.
 power_off_cmd: Option<String>,
 baud_rate: Option<u32>,
 linux_system_tftp: Option<tftp::TftpdHpaConfig>,
 linux_tftp_staging: Vec<tftp::LinuxTftpPrepared>,
Expand All@@ -599,9 +609,17 @@ struct LocalBackend {
}

impl LocalBackend {
 fn new(config: LocalUbootConfig) -> Self {
 fn new(
 config: LocalUbootConfig,
 reset_cmd: Option<String>,
 power_off_cmd: Option<String>,
 ) -> Self {
 let reset_cmd = reset_cmd.or_else(|| config.board_reset_cmd.clone());
 let power_off_cmd = power_off_cmd.or_else(|| config.board_power_off_cmd.clone());
 Self {
 config,
 reset_cmd,
 power_off_cmd,
 baud_rate: None,
 linux_system_tftp: None,
 linux_tftp_staging: Vec::new(),
Expand DownExpand Up@@ -746,7 +764,7 @@ impl RunnerBackend for LocalBackend {

 async fn after_console_open(&mut self, context: &ProcessContext) -> anyhow::Result<()> {
 println!("Waiting for board on power or reset...");
 if let Some(cmd) = self.config.board_reset_cmd.as_deref()
 if let Some(cmd) = self.reset_cmd.as_deref()
 && !cmd.trim().is_empty()
 {
 crate::process::shell_run_cmd(context, cmd)?;
Expand DownExpand Up@@ -805,7 +823,7 @@ impl RunnerBackend for LocalBackend {
 }
 }

 if let Some(cmd) = self.config.board_power_off_cmd.as_deref()
 if let Some(cmd) = self.power_off_cmd.as_deref()
 && !cmd.trim().is_empty()
 && let Err(err) = crate::process::shell_run_cmd(context, cmd)
 {
Expand DownExpand Up@@ -1642,6 +1660,8 @@ mod tests {
 fn local_backend() -> LocalBackend {
 LocalBackend {
 config: LocalUbootConfig::default(),
 reset_cmd: None,
 power_off_cmd: None,
 baud_rate: None,
 linux_system_tftp: None,
 linux_tftp_staging: Vec::new(),
Expand DownExpand Up@@ -2278,7 +2298,7 @@ mod tests {
 std::fs::write(prepared.target_dir().join("keep.txt"), b"keep").unwrap();
 let marker = temp.path().join("powered-off");
 let mut backend = local_backend();
 backend.config.board_power_off_cmd = Some(format!("touch {}", marker.display()));
 backend.power_off_cmd = Some(format!("touch {}", marker.display()));
 backend.linux_tftp_staging.push(prepared);

 let context = make_invocation(temp.path()).process_context().unwrap();
Expand DownExpand Up@@ -2416,6 +2436,56 @@ interface = "eth0"
 assert_eq!(net.interface, "eth0");
 }

 #[test]
 fn uboot_config_parses_board_commands_at_top_level() {
 let config: UbootConfig = toml::from_str(
 r#"
serial = "/dev/null"
baud_rate = "115200"
fail_regex = []
board_reset_cmd = "reset-board"
board_power_off_cmd = "power-off-board"
"#,
 )
 .unwrap();

 assert_eq!(config.board_reset_cmd.as_deref(), Some("reset-board"));
 assert_eq!(
 config.board_power_off_cmd.as_deref(),
 Some("power-off-board")
 );
 assert_eq!(config.local.board_reset_cmd, None);
 assert_eq!(config.local.board_power_off_cmd, None);

 let serialized = toml::to_string(&config).unwrap();
 assert_eq!(serialized.matches("board_reset_cmd").count(), 1);
 assert_eq!(serialized.matches("board_power_off_cmd").count(), 1);

 let backend = LocalBackend::new(
 config.local,
 config.board_reset_cmd,
 config.board_power_off_cmd,
 );
 assert_eq!(backend.reset_cmd.as_deref(), Some("reset-board"));
 assert_eq!(backend.power_off_cmd.as_deref(), Some("power-off-board"));
 }

 #[test]
 fn local_backend_keeps_legacy_command_fields_usable() {
 let backend = LocalBackend::new(
 LocalUbootConfig {
 board_reset_cmd: Some("legacy-reset".into()),
 board_power_off_cmd: Some("legacy-power-off".into()),
 ..Default::default()
 },
 None,
 None,
 );

 assert_eq!(backend.reset_cmd.as_deref(), Some("legacy-reset"));
 assert_eq!(backend.power_off_cmd.as_deref(), Some("legacy-power-off"));
 }

 #[test]
 fn uboot_config_replaces_string_fields() {
 let tmp = tempfile::tempdir().unwrap();
Expand DownExpand Up@@ -2460,6 +2530,8 @@ interface = "eth0"
 kernel_load_addr: Some("${workspaceFolder}".into()),
 fit_load_addr: Some("${package}".into()),
 bootm_addr: Some("${workspace}".into()),
 board_reset_cmd: Some("${workspace}".into()),
 board_power_off_cmd: Some("${package}".into()),
 fail_regex: vec!["${package}".into()],
 uboot_cmd: Some(vec!["setenv boot ${workspace}".into()]),
 shell_check_steps: vec![ShellCheckStep {
Expand All@@ -2471,15 +2543,14 @@ interface = "eth0"
 local: LocalUbootConfig {
 serial: Some("${workspace}/tty".into()),
 baud_rate: Some("${env:OSTOOL_UBOOT_TEST_ENV}".into()),
 board_reset_cmd: Some("${workspace}".into()),
 board_power_off_cmd: Some("${package}".into()),
 net: Some(Net {
 interface: "${env:OSTOOL_UBOOT_TEST_ENV}".into(),
 board_ip: Some("${workspace}".into()),
 gatewayip: Some("${package}".into()),
 netmask: Some("${workspaceFolder}".into()),
 tftp_dir: Some("${package}/tftp".into()),
 }),
 ..Default::default()
 },
 ..Default::default()
 };
Expand All@@ -2501,12 +2572,9 @@ interface = "eth0"
 assert_eq!(config.kernel_load_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.fit_load_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.bootm_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.board_reset_cmd.as_deref(), Some(expected.as_str()));
 assert_eq!(
 config.local.board_reset_cmd.as_deref(),
 Some(expected.as_str())
 );
 assert_eq!(
 config.local.board_power_off_cmd.as_deref(),
 config.board_power_off_cmd.as_deref(),
 Some(expected.as_str())
 );
 assert_eq!(config.fail_regex, vec![expected.clone()]);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config by yfblock · Pull Request #172 · drivercraft/ostool · GitHub
Skip to content
fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config#172

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

yfblock
wants to merge
1
commit into

base:main
Choose a base branch

from


+94

−26

 Open


fix(ostool): honor board_reset_cmd/board_power_off_cmd from uboot config
#172
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


10 changes: 5 additions & 5 deletions
README.en.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -270,11 +270,6 @@ dtb_file = "tools/device_tree.dtb"
# Kernel load address (optional)
kernel_load_addr = "0x80080000"

# Network boot configuration (optional)
[net]
interface = "eth0"
board_ip = "192.168.1.100"

# Board reset command (optional)
board_reset_cmd = "reset"

Expand All@@ -283,6 +278,11 @@ board_power_off_cmd = "poweroff"

# Failure boot regex patterns
fail_regex = ["Boot failed", "Error loading kernel"]

# Network boot configuration (optional)
[net]
interface = "eth0"
board_ip = "192.168.1.100"
```

### Ordered shell initialization steps
Expand Down

10 changes: 5 additions & 5 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -267,11 +267,6 @@ dtb_file = "tools/device_tree.dtb"
# 内核加载地址（可选）
kernel_load_addr = "0x80080000"

# 网络启动配置（可选）
[net]
interface = "eth0"
board_ip = "192.168.1.100"

# 板子重置命令（可选）
board_reset_cmd = "reset"

Expand All@@ -280,6 +275,11 @@ board_power_off_cmd = "poweroff"

# 失败启动的正则表达式
fail_regex = ["Boot failed", "Error loading kernel"]

# 网络启动配置（可选）
[net]
interface = "eth0"
board_ip = "192.168.1.100"
```

### 有序 Shell 初始化步骤
Expand Down

100 changes: 84 additions & 16 deletions
ostool/src/run/uboot.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,11 +160,13 @@ pub struct LocalUbootConfig {
 pub baud_rate: Option<String>,
 /// TFTP boot configuration
 pub net: Option<Net>,
 /// Board reset command
 /// shell command to reset the board
 /// Legacy Rust API compatibility field. Use `UbootConfig::board_reset_cmd`.
 #[serde(skip)]
 #[schemars(skip)]
 pub board_reset_cmd: Option<String>,
 /// Board power off command
 /// shell command to power off the board
 /// Legacy Rust API compatibility field. Use `UbootConfig::board_power_off_cmd`.
 #[serde(skip)]
 #[schemars(skip)]
 pub board_power_off_cmd: Option<String>,
}

Expand DownExpand Up@@ -451,7 +453,11 @@ pub(crate) async fn run_uboot_with_config(
 input: UbootRunInput,
 config: UbootConfig,
) -> anyhow::Result<()> {
 let backend = LocalBackend::new(config.local.clone());
 let backend = LocalBackend::new(
 config.local.clone(),
 config.board_reset_cmd.clone(),
 config.board_power_off_cmd.clone(),
 );
 let mut runner = Runner::new(input, config, backend);
 runner.run().await
}
Expand DownExpand Up@@ -591,6 +597,10 @@ trait RunnerBackend {

struct LocalBackend {
 config: LocalUbootConfig,
 /// Host-side reset command, taken from `UbootConfig::board_reset_cmd`.
 reset_cmd: Option<String>,
 /// Host-side power-off command, taken from `UbootConfig::board_power_off_cmd`.
 power_off_cmd: Option<String>,
 baud_rate: Option<u32>,
 linux_system_tftp: Option<tftp::TftpdHpaConfig>,
 linux_tftp_staging: Vec<tftp::LinuxTftpPrepared>,
Expand All@@ -599,9 +609,17 @@ struct LocalBackend {
}

impl LocalBackend {
 fn new(config: LocalUbootConfig) -> Self {
 fn new(
 config: LocalUbootConfig,
 reset_cmd: Option<String>,
 power_off_cmd: Option<String>,
 ) -> Self {
 let reset_cmd = reset_cmd.or_else(|| config.board_reset_cmd.clone());
 let power_off_cmd = power_off_cmd.or_else(|| config.board_power_off_cmd.clone());
 Self {
 config,
 reset_cmd,
 power_off_cmd,
 baud_rate: None,
 linux_system_tftp: None,
 linux_tftp_staging: Vec::new(),
Expand DownExpand Up@@ -746,7 +764,7 @@ impl RunnerBackend for LocalBackend {

 async fn after_console_open(&mut self, context: &ProcessContext) -> anyhow::Result<()> {
 println!("Waiting for board on power or reset...");
 if let Some(cmd) = self.config.board_reset_cmd.as_deref()
 if let Some(cmd) = self.reset_cmd.as_deref()
 && !cmd.trim().is_empty()
 {
 crate::process::shell_run_cmd(context, cmd)?;
Expand DownExpand Up@@ -805,7 +823,7 @@ impl RunnerBackend for LocalBackend {
 }
 }

 if let Some(cmd) = self.config.board_power_off_cmd.as_deref()
 if let Some(cmd) = self.power_off_cmd.as_deref()
 && !cmd.trim().is_empty()
 && let Err(err) = crate::process::shell_run_cmd(context, cmd)
 {
Expand DownExpand Up@@ -1642,6 +1660,8 @@ mod tests {
 fn local_backend() -> LocalBackend {
 LocalBackend {
 config: LocalUbootConfig::default(),
 reset_cmd: None,
 power_off_cmd: None,
 baud_rate: None,
 linux_system_tftp: None,
 linux_tftp_staging: Vec::new(),
Expand DownExpand Up@@ -2278,7 +2298,7 @@ mod tests {
 std::fs::write(prepared.target_dir().join("keep.txt"), b"keep").unwrap();
 let marker = temp.path().join("powered-off");
 let mut backend = local_backend();
 backend.config.board_power_off_cmd = Some(format!("touch {}", marker.display()));
 backend.power_off_cmd = Some(format!("touch {}", marker.display()));
 backend.linux_tftp_staging.push(prepared);

 let context = make_invocation(temp.path()).process_context().unwrap();
Expand DownExpand Up@@ -2416,6 +2436,56 @@ interface = "eth0"
 assert_eq!(net.interface, "eth0");
 }

 #[test]
 fn uboot_config_parses_board_commands_at_top_level() {
 let config: UbootConfig = toml::from_str(
 r#"
serial = "/dev/null"
baud_rate = "115200"
fail_regex = []
board_reset_cmd = "reset-board"
board_power_off_cmd = "power-off-board"
"#,
 )
 .unwrap();

 assert_eq!(config.board_reset_cmd.as_deref(), Some("reset-board"));
 assert_eq!(
 config.board_power_off_cmd.as_deref(),
 Some("power-off-board")
 );
 assert_eq!(config.local.board_reset_cmd, None);
 assert_eq!(config.local.board_power_off_cmd, None);

 let serialized = toml::to_string(&config).unwrap();
 assert_eq!(serialized.matches("board_reset_cmd").count(), 1);
 assert_eq!(serialized.matches("board_power_off_cmd").count(), 1);

 let backend = LocalBackend::new(
 config.local,
 config.board_reset_cmd,
 config.board_power_off_cmd,
 );
 assert_eq!(backend.reset_cmd.as_deref(), Some("reset-board"));
 assert_eq!(backend.power_off_cmd.as_deref(), Some("power-off-board"));
 }

 #[test]
 fn local_backend_keeps_legacy_command_fields_usable() {
 let backend = LocalBackend::new(
 LocalUbootConfig {
 board_reset_cmd: Some("legacy-reset".into()),
 board_power_off_cmd: Some("legacy-power-off".into()),
 ..Default::default()
 },
 None,
 None,
 );

 assert_eq!(backend.reset_cmd.as_deref(), Some("legacy-reset"));
 assert_eq!(backend.power_off_cmd.as_deref(), Some("legacy-power-off"));
 }

 #[test]
 fn uboot_config_replaces_string_fields() {
 let tmp = tempfile::tempdir().unwrap();
Expand DownExpand Up@@ -2460,6 +2530,8 @@ interface = "eth0"
 kernel_load_addr: Some("${workspaceFolder}".into()),
 fit_load_addr: Some("${package}".into()),
 bootm_addr: Some("${workspace}".into()),
 board_reset_cmd: Some("${workspace}".into()),
 board_power_off_cmd: Some("${package}".into()),
 fail_regex: vec!["${package}".into()],
 uboot_cmd: Some(vec!["setenv boot ${workspace}".into()]),
 shell_check_steps: vec![ShellCheckStep {
Expand All@@ -2471,15 +2543,14 @@ interface = "eth0"
 local: LocalUbootConfig {
 serial: Some("${workspace}/tty".into()),
 baud_rate: Some("${env:OSTOOL_UBOOT_TEST_ENV}".into()),
 board_reset_cmd: Some("${workspace}".into()),
 board_power_off_cmd: Some("${package}".into()),
 net: Some(Net {
 interface: "${env:OSTOOL_UBOOT_TEST_ENV}".into(),
 board_ip: Some("${workspace}".into()),
 gatewayip: Some("${package}".into()),
 netmask: Some("${workspaceFolder}".into()),
 tftp_dir: Some("${package}/tftp".into()),
 }),
 ..Default::default()
 },
 ..Default::default()
 };
Expand All@@ -2501,12 +2572,9 @@ interface = "eth0"
 assert_eq!(config.kernel_load_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.fit_load_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.bootm_addr.as_deref(), Some(expected.as_str()));
 assert_eq!(config.board_reset_cmd.as_deref(), Some(expected.as_str()));
 assert_eq!(
 config.local.board_reset_cmd.as_deref(),
 Some(expected.as_str())
 );
 assert_eq!(
 config.local.board_power_off_cmd.as_deref(),
 config.board_power_off_cmd.as_deref(),
 Some(expected.as_str())
 );
 assert_eq!(config.fail_regex, vec![expected.clone()]);
Expand Down