Compare commits
6 Commits
v2.6.5
..
d1031d4d92
| Author | SHA1 | Date | |
|---|---|---|---|
| d1031d4d92 | |||
| 2fe4e72962 | |||
| 8443a052c4 | |||
| d0c3adcd83 | |||
| 1ce000dfec | |||
| 567d66c731 |
Generated
+1
-1
@@ -881,7 +881,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "init"
|
||||
version = "2.6.5"
|
||||
version = "2.6.4"
|
||||
dependencies = [
|
||||
"dkl",
|
||||
"env_logger",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "init"
|
||||
version = "2.6.5"
|
||||
version = "2.6.4"
|
||||
edition = "2024"
|
||||
|
||||
[profile.release]
|
||||
|
||||
@@ -79,30 +79,7 @@ pub async fn bootstrap(cfg: Config) {
|
||||
})
|
||||
.await;
|
||||
|
||||
exec("chroot", &["/system", "update-ca-certificates"]).await;
|
||||
|
||||
// activate ttyS* consoles as needed
|
||||
retry_or_ignore(async || {
|
||||
const PATH: &str = "/system/etc/inittab";
|
||||
let mut inittab = fs::read_to_string(PATH).await?;
|
||||
let mut changed = false;
|
||||
for opt in utils::cmdline().filter_map(|s| s.strip_prefix("console=ttyS")) {
|
||||
info!("inittab: adding entry for ttyS{opt}");
|
||||
changed = true;
|
||||
|
||||
let mut params = opt.split(',');
|
||||
let num = params.next().unwrap();
|
||||
let speed = params.next().unwrap_or("115200");
|
||||
inittab.push_str(&format!(
|
||||
"S{num}:12345:respawn:/sbin/agetty --noclear {speed} ttyS{num} linux\n"
|
||||
));
|
||||
}
|
||||
if changed {
|
||||
fs::write(PATH, inittab.as_bytes()).await?;
|
||||
}
|
||||
Ok(())
|
||||
})
|
||||
.await;
|
||||
exec("chroot", &["/system", "update-ca-certificates"]).await
|
||||
}
|
||||
|
||||
struct Verifier {
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ static CMDLINE: LazyLock<String> = LazyLock::new(|| {
|
||||
.unwrap_or_default()
|
||||
});
|
||||
|
||||
pub fn cmdline() -> impl Iterator<Item = &'static str> {
|
||||
fn cmdline() -> impl Iterator<Item = &'static str> {
|
||||
CMDLINE.split_ascii_whitespace()
|
||||
}
|
||||
|
||||
|
||||
@@ -95,8 +95,11 @@ lvm:
|
||||
#- dev: /dev/storage/bootstrap
|
||||
#- dev: /dev/storage/dls
|
||||
|
||||
signer_public_key: 'MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQAd5sR4NqLtjSt8ESNlYWvuufYj7v+aYGDlgxQThcKbzDPVe639IfH94hHE0l9TAfyU94qtN/GpFyKJ68F/u2pu70A/umT1m24ELFDqXlQXqhTsH91r+nYUZ7due3EqSrvru/yjchNNRkpoCCu3QkDF25KnrYfWWHqj9ZIRlBTCJE9SwM='
|
||||
signer_public_key: 'MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBe6Y3zGQUIHvVXoS5GI8irY8yoB0ozFpzn/cUykA46TkHdJ8xCEaaM1MpqMrfWgDtP/rA2KeE9HjVerLnEFD01uUAUh4/OYgCBDYJPhridVDoC78KOJpkWBj7Shl0Rp0AtETvatNPa1RRe15V7nDF/Nm75Y6O3IL29lYPQ6jqEGhR810='
|
||||
bootstrap:
|
||||
dev: /dev/storage/bootstrap
|
||||
seed: http://192.168.12.254:7606/public/download-set/host/m1/bootstrap.tar?set=ICM5KUZDRAMJPMO5OWW6PSIFYF4AHMYLAQSBZVFUDNG4DQDEW6UFQQJQKMGIXPI4CFOZFVA4CXULRXCAHKX3WELVAYS246FM6SGSGHIOAQRE2GDEOC4RUAAAQA3GEZDFMUZDOMD4NA5CUOTCN5XXI43UOJQXALTUMFZAAAAAACHHUMRU
|
||||
seed_proxy: "http://[fd6e:7674:6f70::1]:8888"
|
||||
seed_ca: 'MIIBhTCCASugAwIBAgIRAMiu/MXPMl/6vjR2HZHwflQwCgYIKoZIzj0EAwIwIjEgMB4GA1UEAxMXbm92aXQtaW50ZXJuYWwtY2EtZWNkc2EwHhcNMjYwNDIxMDkzMTEyWhcNMjYwNzIwMDkzMTEyWjAiMSAwHgYDVQQDExdub3ZpdC1pbnRlcm5hbC1jYS1lY2RzYTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABC87aJX1WltmkZQ2Am4kCIQTFLqkLE4zTAznP5K9k3RH4kxuB2IjkQyyii6zk/9bus0q76UmennubDxtH5Y7ZgGjQjBAMA4GA1UdDwEB/wQEAwICpDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSlmVUj3CIWL1CW7K1BgOXjR6j6kjAKBggqhkjOPQQDAgNIADBFAiEAhIvi4eGFjC4xu80yKKYFeZ5X3f2RPfnOg4hK3GqZgc0CIF97A9An2Pt4TkKkC/W+TX/tEXGxcDyJHBpB3BdpN7QW'
|
||||
seed: https://dls.edicia-prod.nv/public/downloads/V6VWZWQEGX7T7Q524Z4HLL2ZAG42YRXHVGXSTVAL4WEC2VIG4GWQ/bootstrap.tar
|
||||
#seed: https://192.168.12.254:7606/public/download-set/host/m1/bootstrap.tar?set=IDZTK4AUNCYCTKF3GIEGSNZF3I7XCINCTJSOWL2JPHCJ2IAZWDECY2XCGQ5MCTJBNFIKBNCLIA3PJSN7IOH7URGXYRYZRCGF4VSW4RIAAQRE2GDEOC4RWAAAQA3DSZJZMU4TGOL4NA5G2MJ2MJXW65DTORZGC4BOORQXEAAAAAADJMFLUE
|
||||
|
||||
|
||||
Reference in New Issue
Block a user