fix: add luks prompt to fix broken on external keyboard

This commit is contained in:
Willem Vanhulle committed 2026-10-14 18:44:08 +02:00
1 parent 0c30e71261
commit d0bffd5dac
19 files changed
+574 -105

No files matched your search

+12 -13
View File
@@ -2,15 +2,16 @@ mod clock;
mod console;
mod error;
mod feed;
mod password;
mod run;
mod sysroot;
mod systemd;
use std::{fs, io::ErrorKind, path::PathBuf, process::ExitCode, time::Duration};
use bootvine::palette::Config;
use bootvine::config::{Config, Timing};
use clap::Parser;
use jiff::SignedDuration;
use jiff::fmt::friendly::SpanParser;
use crate::{
run::{Options, run},
@@ -34,24 +35,19 @@ struct Cli {
target: Option<String>,
#[arg(
long,
default_value = "1s",
value_parser = parse_duration,
help = "How long the final frame stays on screen, e.g. 1s or 500ms"
value_parser = |raw: &str| SpanParser::new().parse_unsigned_duration(raw),
help = "How long the final frame stays on screen, e.g. 1s or 500ms; overrides \
timing.keep_final_frame_for"
)]
hold: Duration,
hold: Option<Duration>,
#[arg(
long,
default_value = "/etc/bootvine.toml",
help = "TOML file with a [palette] table"
help = "TOML file with [palette] and [timing] tables"
)]
config: PathBuf,
}
fn parse_duration(raw: &str) -> Result<Duration, String> {
let signed: SignedDuration = raw.parse().map_err(|error| format!("{error}"))?;
Duration::try_from(signed).map_err(|error| format!("{error}"))
}
fn main() -> ExitCode {
let cli = Cli::parse();
let config = match fs::read_to_string(&cli.config) {
@@ -69,7 +65,10 @@ fn main() -> ExitCode {
scope: if cli.user { Scope::User } else { Scope::System },
shutdown: cli.shutdown,
target: cli.target,
hold: cli.hold,
timing: Timing {
keep_final_frame_for: cli.hold.unwrap_or(config.timing.keep_final_frame_for),
..config.timing
},
palette: config.palette,
};
match run(&options) {