rename boot-tree to bootvine
This commit is contained in:
1 parent
101d7bae89
commit
2d586f57f7
21 files changed
+104
-104
No files matched your search
+2
-2
@@ -6,7 +6,7 @@ use std::{
|
||||
time::{Duration, Instant},
|
||||
};
|
||||
|
||||
use boot_tree::model::{BootState, HANDOFF_UNIT, HOST_MILESTONES};
|
||||
use bootvine::model::{BootState, HANDOFF_UNIT, HOST_MILESTONES};
|
||||
use dbus::Path;
|
||||
|
||||
use crate::{
|
||||
@@ -133,7 +133,7 @@ impl Feed {
|
||||
jobs.iter()
|
||||
.for_each(|job| state.queue_job(job.id, &job.unit, now));
|
||||
eprintln!(
|
||||
"boot-tree: watching {root} in {} as pid {} over {}",
|
||||
"bootvine: watching {root} in {} as pid {} over {}",
|
||||
if self.in_initrd { "initrd" } else { "stage 2" },
|
||||
process::id(),
|
||||
if session.peer_to_peer {
|
||||
|
||||
+5
-5
@@ -8,7 +8,7 @@ mod systemd;
|
||||
|
||||
use std::{fs, io::ErrorKind, path::PathBuf, process::ExitCode, time::Duration};
|
||||
|
||||
use boot_tree::palette::Config;
|
||||
use bootvine::palette::Config;
|
||||
use clap::Parser;
|
||||
use jiff::SignedDuration;
|
||||
|
||||
@@ -36,7 +36,7 @@ struct Cli {
|
||||
hold: Duration,
|
||||
#[arg(
|
||||
long,
|
||||
default_value = "/etc/boot-tree.toml",
|
||||
default_value = "/etc/bootvine.toml",
|
||||
help = "TOML file with a [palette] table"
|
||||
)]
|
||||
config: PathBuf,
|
||||
@@ -51,12 +51,12 @@ fn main() -> ExitCode {
|
||||
let cli = Cli::parse();
|
||||
let config = match fs::read_to_string(&cli.config) {
|
||||
Ok(text) => toml::from_str(&text).unwrap_or_else(|error| {
|
||||
eprintln!("boot-tree: ignoring {}: {error}", cli.config.display());
|
||||
eprintln!("bootvine: ignoring {}: {error}", cli.config.display());
|
||||
Config::default()
|
||||
}),
|
||||
Err(error) if error.kind() == ErrorKind::NotFound => Config::default(),
|
||||
Err(error) => {
|
||||
eprintln!("boot-tree: cannot read {}: {error}", cli.config.display());
|
||||
eprintln!("bootvine: cannot read {}: {error}", cli.config.display());
|
||||
Config::default()
|
||||
}
|
||||
};
|
||||
@@ -69,7 +69,7 @@ fn main() -> ExitCode {
|
||||
match run(&options) {
|
||||
Ok(()) => ExitCode::SUCCESS,
|
||||
Err(error) => {
|
||||
eprintln!("boot-tree: {error}");
|
||||
eprintln!("bootvine: {error}");
|
||||
ExitCode::FAILURE
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -8,7 +8,7 @@ use std::{
|
||||
time::{Duration, Instant},
|
||||
};
|
||||
|
||||
use boot_tree::{
|
||||
use bootvine::{
|
||||
model::{BootState, Phase},
|
||||
palette::Palette,
|
||||
view::BootView,
|
||||
@@ -115,7 +115,7 @@ fn watch(
|
||||
})?;
|
||||
if state.is_complete() {
|
||||
eprintln!(
|
||||
"boot-tree: {} reached, handing the console over",
|
||||
"bootvine: {} reached, handing the console over",
|
||||
state.root.as_deref().unwrap_or("boot")
|
||||
);
|
||||
sleep(hold);
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
use std::{iter, time::Duration};
|
||||
|
||||
use boot_tree::model::{ActiveState, Activity, JobResult, UnitFacts};
|
||||
use bootvine::model::{ActiveState, Activity, JobResult, UnitFacts};
|
||||
use dbus::{
|
||||
Message, MessageType, Path,
|
||||
arg::{AppendAll, PropMap, RefArg, Variant},
|
||||
|
||||
+2
-2
@@ -196,7 +196,7 @@ impl BootView<'_> {
|
||||
});
|
||||
Table::new(
|
||||
[Row::new([
|
||||
Line::from(format!("boot-tree {}", self.host)),
|
||||
Line::from(format!("bootvine {}", self.host)),
|
||||
Line::from(total.unwrap_or_default()).right_aligned(),
|
||||
])],
|
||||
[Constraint::Fill(1), Constraint::Length(DURATION_WIDTH)],
|
||||
@@ -804,7 +804,7 @@ mod tests {
|
||||
fn tree_on_top_timeline_below() {
|
||||
let lines = render(&boot_in_progress(), 12_400 * MS, 110, 24);
|
||||
let screen = lines.join("\n");
|
||||
assert_eq!(lines[0], "boot-tree ryzen", "{screen}");
|
||||
assert_eq!(lines[0], "bootvine ryzen", "{screen}");
|
||||
assert!(lines[2].starts_with("── stage 2 ──"), "{screen}");
|
||||
assert!(lines[2].ends_with("12.4s ──"), "{screen}");
|
||||
assert!(lines[3].starts_with("graphical.target"), "{screen}");
|
||||
|
||||
Reference in new issue
Block a user