From a1495dd33d6e7fb022743663e1942682bcaecdb0 Mon Sep 17 00:00:00 2001 From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com> Date: Wed, 15 Nov 2023 12:17:10 -0700 Subject: [PATCH 1/6] set better governor hierarchy and add cli command to change (#2519) --- core/startos/src/bins/mod.rs | 20 +++------ core/startos/src/db/model.rs | 3 ++ core/startos/src/init.rs | 27 ++++++------ core/startos/src/procedure/js_scripts.rs | 8 ++-- core/startos/src/system.rs | 54 +++++++++++++++++++++++- core/startos/src/util/cpupower.rs | 24 ++++++++++- 6 files changed, 100 insertions(+), 36 deletions(-) diff --git a/core/startos/src/bins/mod.rs b/core/startos/src/bins/mod.rs index c391338fe..f9c88cae9 100644 --- a/core/startos/src/bins/mod.rs +++ b/core/startos/src/bins/mod.rs @@ -18,7 +18,7 @@ fn select_executable(name: &str) -> Option { match name { #[cfg(feature = "avahi-alias")] "avahi-alias" => Some(avahi_alias::main), - #[cfg(feature = "js_engine")] + #[cfg(feature = "js-engine")] "start-deno" => Some(start_deno::main), #[cfg(feature = "cli")] "start-cli" => Some(start_cli::main), @@ -36,24 +36,14 @@ fn select_executable(name: &str) -> Option { pub fn startbox() { let args = std::env::args().take(2).collect::>(); - if let Some(x) = args + let executable = args .get(0) .and_then(|s| Path::new(&*s).file_name()) - .and_then(|s| s.to_str()) - .and_then(|s| select_executable(&s)) - { - x() - } else if let Some(x) = args.get(1).and_then(|s| select_executable(&s)) { + .and_then(|s| s.to_str()); + if let Some(x) = executable.and_then(|s| select_executable(&s)) { x() } else { - eprintln!( - "unknown executable: {}", - args.get(0) - .filter(|x| &**x != "startbox") - .or_else(|| args.get(1)) - .map(|s| s.as_str()) - .unwrap_or("N/A") - ); + eprintln!("unknown executable: {}", executable.unwrap_or("N/A")); std::process::exit(1); } } diff --git a/core/startos/src/db/model.rs b/core/startos/src/db/model.rs index e1c1767ec..bce8886ca 100644 --- a/core/startos/src/db/model.rs +++ b/core/startos/src/db/model.rs @@ -22,6 +22,7 @@ use crate::net::utils::{get_iface_ipv4_addr, get_iface_ipv6_addr}; use crate::prelude::*; use crate::s9pk::manifest::{Manifest, PackageId}; use crate::status::Status; +use crate::util::cpupower::{get_preferred_governor, Governor}; use crate::util::Version; use crate::version::{Current, VersionT}; use crate::{ARCH, PLATFORM}; @@ -83,6 +84,7 @@ impl Database { .join(":"), ntp_synced: false, zram: true, + governor: None, }, package_data: AllPackageData::default(), ui: serde_json::from_str(include_str!(concat!( @@ -134,6 +136,7 @@ pub struct ServerInfo { pub ntp_synced: bool, #[serde(default)] pub zram: bool, + pub governor: Option, } #[derive(Debug, Deserialize, Serialize, HasModel)] diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs index 288149f37..097696dac 100644 --- a/core/startos/src/init.rs +++ b/core/startos/src/init.rs @@ -20,7 +20,7 @@ use crate::middleware::auth::LOCAL_AUTH_COOKIE_PATH; use crate::prelude::*; use crate::sound::BEP; use crate::util::cpupower::{ - current_governor, get_available_governors, set_governor, GOVERNOR_PERFORMANCE, + current_governor, get_available_governors, get_preferred_governor, set_governor, }; use crate::util::docker::{create_bridge_network, CONTAINER_DATADIR, CONTAINER_TOOL}; use crate::util::Invoke; @@ -354,21 +354,20 @@ pub async fn init(cfg: &RpcContextConfig) -> Result { .await?; tracing::info!("Enabled Docker QEMU Emulation"); - if current_governor() - .await? - .map(|g| &g != &GOVERNOR_PERFORMANCE) - .unwrap_or(false) - { - tracing::info!("Setting CPU Governor to \"{}\"", GOVERNOR_PERFORMANCE); - if get_available_governors() - .await? - .contains(&GOVERNOR_PERFORMANCE) - { - set_governor(&GOVERNOR_PERFORMANCE).await?; - tracing::info!("Set CPU Governor"); + let governor = if let Some(governor) = &server_info.governor { + if get_available_governors().await?.contains(governor) { + Some(governor) } else { - tracing::warn!("CPU Governor \"{}\" Not Available", GOVERNOR_PERFORMANCE) + tracing::warn!("CPU Governor \"{governor}\" Not Available"); + None } + } else { + get_preferred_governor().await? + }; + if let Some(governor) = governor { + tracing::info!("Setting CPU Governor to \"{governor}\""); + set_governor(governor).await?; + tracing::info!("Set CPU Governor"); } let mut time_not_synced = true; diff --git a/core/startos/src/procedure/js_scripts.rs b/core/startos/src/procedure/js_scripts.rs index 88a45988f..43553cee0 100644 --- a/core/startos/src/procedure/js_scripts.rs +++ b/core/startos/src/procedure/js_scripts.rs @@ -226,18 +226,18 @@ async fn test_start_deno_command() -> Result { .arg("build") .invoke(ErrorKind::Unknown) .await?; - if tokio::fs::metadata("target/debug/start-deno") + if tokio::fs::metadata("../target/debug/start-deno") .await .is_err() { Command::new("ln") .arg("-rsf") - .arg("target/debug/startbox") - .arg("target/debug/start-deno") + .arg("../target/debug/startbox") + .arg("../target/debug/start-deno") .invoke(crate::ErrorKind::Filesystem) .await?; } - Ok(Command::new("target/debug/start-deno")) + Ok(Command::new("../target/debug/start-deno")) } #[tokio::test] diff --git a/core/startos/src/system.rs b/core/startos/src/system.rs index 53216f796..b5cd42844 100644 --- a/core/startos/src/system.rs +++ b/core/startos/src/system.rs @@ -1,3 +1,4 @@ +use std::collections::BTreeSet; use std::fmt; use chrono::Utc; @@ -20,11 +21,12 @@ use crate::logs::{ }; use crate::prelude::*; use crate::shutdown::Shutdown; +use crate::util::cpupower::{get_available_governors, set_governor, Governor}; use crate::util::serde::{display_serializable, IoFormat}; use crate::util::{display_none, Invoke}; use crate::{Error, ErrorKind, ResultExt}; -#[command(subcommands(zram))] +#[command(subcommands(zram, governor))] pub async fn experimental() -> Result<(), Error> { Ok(()) } @@ -85,6 +87,56 @@ pub async fn zram(#[context] ctx: RpcContext, #[arg] enable: bool) -> Result<(), Ok(()) } +#[derive(Debug, Deserialize, Serialize)] +pub struct GovernorInfo { + current: Option, + available: BTreeSet, +} + +fn display_governor_info(arg: GovernorInfo, matches: &ArgMatches) { + use prettytable::*; + + if matches.is_present("format") { + return display_serializable(arg, matches); + } + + let mut table = Table::new(); + table.add_row(row![bc -> "GOVERNORS"]); + for entry in arg.available { + if Some(&entry) == arg.current.as_ref() { + table.add_row(row![g -> format!("* {entry} (current)")]); + } else { + table.add_row(row![entry]); + } + } + table.print_tty(false).unwrap(); +} + +#[command(display(display_governor_info))] +pub async fn governor( + #[context] ctx: RpcContext, + #[allow(unused_variables)] + #[arg(long = "format")] + format: Option, + #[arg] set: Option, +) -> Result { + let available = get_available_governors().await?; + if let Some(set) = set { + if !available.contains(&set) { + return Err(Error::new( + eyre!("Governor {set} not available"), + ErrorKind::InvalidRequest, + )); + } + set_governor(&set).await?; + ctx.db + .mutate(|d| d.as_server_info_mut().as_governor_mut().ser(&Some(set))) + .await?; + } + let current = ctx.db.peek().await.as_server_info().as_governor().de()?; + Ok(GovernorInfo { current, available }) +} + #[derive(Serialize, Deserialize)] pub struct TimeInfo { now: String, diff --git a/core/startos/src/util/cpupower.rs b/core/startos/src/util/cpupower.rs index a48502754..7fa850a88 100644 --- a/core/startos/src/util/cpupower.rs +++ b/core/startos/src/util/cpupower.rs @@ -7,10 +7,20 @@ use tokio::process::Command; use crate::prelude::*; use crate::util::Invoke; -pub const GOVERNOR_PERFORMANCE: Governor = Governor(Cow::Borrowed("performance")); +pub const GOVERNOR_HEIRARCHY: &[Governor] = &[ + Governor(Cow::Borrowed("ondemand")), + Governor(Cow::Borrowed("schedutil")), + Governor(Cow::Borrowed("conservative")), +]; -#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)] +#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize)] pub struct Governor(Cow<'static, str>); +impl std::str::FromStr for Governor { + type Err = std::convert::Infallible; + fn from_str(s: &str) -> Result { + Ok(Self(s.to_owned().into())) + } +} impl std::fmt::Display for Governor { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { self.0.fmt(f) @@ -114,6 +124,16 @@ pub async fn current_governor() -> Result, Error> { )) } +pub async fn get_preferred_governor() -> Result, Error> { + let governors = get_available_governors().await?; + for governor in GOVERNOR_HEIRARCHY { + if governors.contains(governor) { + return Ok(Some(governor)); + } + } + Ok(None) +} + pub async fn set_governor(governor: &Governor) -> Result<(), Error> { Command::new("cpupower") .arg("frequency-set") From 417053a6a27270704a72bb2595f91efc9faeeabd Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Wed, 15 Nov 2023 12:17:33 -0700 Subject: [PATCH 2/6] FE version bump and minor copy updates (#2517) version bump and minor copy updates --- web/package-lock.json | 4 ++-- web/package.json | 2 +- web/patchdb-ui-seed.json | 2 +- .../modals/os-welcome/os-welcome.page.html | 20 +++++++++++++++++++ .../experimental-features.page.html | 4 ++-- .../experimental-features.page.ts | 9 ++++----- .../ui/src/app/services/api/api.fixures.ts | 4 ++-- .../ui/src/app/services/api/mock-patch.ts | 2 +- 8 files changed, 33 insertions(+), 14 deletions(-) diff --git a/web/package-lock.json b/web/package-lock.json index 40a67f4d9..160cb31bb 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "startos-ui", - "version": "0.3.5", + "version": "0.3.5.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "startos-ui", - "version": "0.3.5", + "version": "0.3.5.1", "dependencies": { "@angular/animations": "^14.1.0", "@angular/common": "^14.1.0", diff --git a/web/package.json b/web/package.json index e001b4484..7784543fe 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "startos-ui", - "version": "0.3.5", + "version": "0.3.5.1", "author": "Start9 Labs, Inc", "homepage": "https://start9.com/", "scripts": { diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json index 5e31b198b..0a678d4e8 100644 --- a/web/patchdb-ui-seed.json +++ b/web/patchdb-ui-seed.json @@ -1,6 +1,6 @@ { "name": null, - "ack-welcome": "0.3.5", + "ack-welcome": "0.3.5.1", "marketplace": { "selected-url": "https://registry.start9.com/", "known-hosts": { diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html index ed05ccb45..23bc7e1fd 100644 --- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html +++ b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html @@ -12,6 +12,26 @@

This Release

+

0.3.5.1

+

+ View the complete + + release notes + + for more details. +

+
Highlights
+
    +
  • Revert perpetual performance mode for quieter fan
    • +
  • Minor bug fixes
    • +
+ +

Previous 0.3.5.x Releases

+

0.3.5

View the complete diff --git a/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.html b/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.html index 69f82ff43..0ca8c7d8e 100644 --- a/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.html +++ b/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.html @@ -27,8 +27,8 @@

{{ server.zram ? 'Disable' : 'Enable' }} zram

- Enabling zram may improve server performance, especially on low RAM - devices + Zram creates compressed swap in memory, resulting in faster I/O for + low RAM devices

diff --git a/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.ts b/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.ts index ed57066ab..bf445250a 100644 --- a/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.ts +++ b/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.ts @@ -65,10 +65,10 @@ export class ExperimentalFeaturesPage { async presentAlertZram(enabled: boolean) { const alert = await this.alertCtrl.create({ - header: enabled ? 'Confirm' : 'Warning', + header: 'Confirm', message: enabled - ? 'Are you sure you want to disable zram?' - : 'zram on StartOS is experimental. It may increase performance of you server, especially if it is a low RAM device.', + ? 'Are you sure you want to disable zram? It provides significant performance benefits on low RAM devices.' + : 'Enable zram? It will only make a difference on lower RAM devices.', buttons: [ { text: 'Cancel', @@ -82,7 +82,6 @@ export class ExperimentalFeaturesPage { cssClass: 'enter-click', }, ], - cssClass: enabled ? '' : 'alert-warning-message', }) await alert.present() } @@ -122,7 +121,7 @@ export class ExperimentalFeaturesPage { private async toggleZram(enabled: boolean) { const loader = await this.loadingCtrl.create({ - message: enabled ? 'Disabling zram...' : 'Enabling zram', + message: enabled ? 'Disabling zram...' : 'Enabling zram...', }) await loader.present() diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts index c4db1225d..17460609a 100644 --- a/web/projects/ui/src/app/services/api/api.fixures.ts +++ b/web/projects/ui/src/app/services/api/api.fixures.ts @@ -21,10 +21,10 @@ export module Mock { 'shutting-down': false, } export const MarketplaceEos: RR.GetMarketplaceEosRes = { - version: '0.3.5', + version: '0.3.5.1', headline: 'Our biggest release ever.', 'release-notes': { - '0.3.5': 'Some **Markdown** release _notes_ for 0.3.5', + '0.3.5.1': 'Some **Markdown** release _notes_ for 0.3.5.1', '0.3.4.4': 'Some **Markdown** release _notes_ for 0.3.4.4', '0.3.4.3': 'Some **Markdown** release _notes_ for 0.3.4.3', '0.3.4.2': 'Some **Markdown** release _notes_ for 0.3.4.2', diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts index 0c930aa8f..1dc7abd66 100644 --- a/web/projects/ui/src/app/services/api/mock-patch.ts +++ b/web/projects/ui/src/app/services/api/mock-patch.ts @@ -42,7 +42,7 @@ export const mockPatchData: DataModel = { }, 'server-info': { id: 'abcdefgh', - version: '0.3.5', + version: '0.3.5.1', 'last-backup': new Date(new Date().valueOf() - 604800001).toISOString(), 'lan-address': 'https://adjective-noun.local', 'tor-address': 'https://myveryownspecialtoraddress.onion', From a551bc53757369be9c2fb5477ab289184b016ded Mon Sep 17 00:00:00 2001 From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com> Date: Wed, 15 Nov 2023 18:50:29 -0700 Subject: [PATCH 3/6] bump version (#2520) * bump version * Update image-recipe/build.sh * fix podman repo * switch back to unstable for podman --- core/Cargo.lock | 2 +- core/startos/Cargo.toml | 2 +- core/startos/src/lib.rs | 2 -- core/startos/src/version/mod.rs | 9 +++++++- core/startos/src/version/v0_3_5_1.rs | 32 ++++++++++++++++++++++++++++ image-recipe/build.sh | 4 ++-- system-images/compat/Cargo.lock | 2 +- 7 files changed, 45 insertions(+), 8 deletions(-) create mode 100644 core/startos/src/version/v0_3_5_1.rs diff --git a/core/Cargo.lock b/core/Cargo.lock index 8e3d423ab..dab184deb 100644 --- a/core/Cargo.lock +++ b/core/Cargo.lock @@ -4921,7 +4921,7 @@ dependencies = [ [[package]] name = "start-os" -version = "0.3.5" +version = "0.3.5-rev.1" dependencies = [ "aes", "async-compression", diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml index 95a8fb016..c794b4a06 100644 --- a/core/startos/Cargo.toml +++ b/core/startos/Cargo.toml @@ -14,7 +14,7 @@ keywords = [ name = "start-os" readme = "README.md" repository = "https://github.com/Start9Labs/start-os" -version = "0.3.5" +version = "0.3.5-rev.1" license = "MIT" [lib] diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs index 141ef1780..5dac1f628 100644 --- a/core/startos/src/lib.rs +++ b/core/startos/src/lib.rs @@ -1,5 +1,3 @@ -#![recursion_limit = "256"] - pub const DEFAULT_MARKETPLACE: &str = "https://registry.start9.com"; // pub const COMMUNITY_MARKETPLACE: &str = "https://community-registry.start9.com"; pub const BUFFER_SIZE: usize = 1024; diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs index 929d76dfc..4c6f157a5 100644 --- a/core/startos/src/version/mod.rs +++ b/core/startos/src/version/mod.rs @@ -14,8 +14,9 @@ mod v0_3_4_2; mod v0_3_4_3; mod v0_3_4_4; mod v0_3_5; +mod v0_3_5_1; -pub type Current = v0_3_5::Version; +pub type Current = v0_3_5_1::Version; #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)] #[serde(untagged)] @@ -26,6 +27,7 @@ enum Version { V0_3_4_3(Wrapper), V0_3_4_4(Wrapper), V0_3_5(Wrapper), + V0_3_5_1(Wrapper), Other(emver::Version), } @@ -47,6 +49,7 @@ impl Version { Version::V0_3_4_3(Wrapper(x)) => x.semver(), Version::V0_3_4_4(Wrapper(x)) => x.semver(), Version::V0_3_5(Wrapper(x)) => x.semver(), + Version::V0_3_5_1(Wrapper(x)) => x.semver(), Version::Other(x) => x.clone(), } } @@ -172,6 +175,7 @@ pub async fn init(db: &PatchDb, secrets: &PgPool) -> Result<(), Error> { Version::V0_3_4_3(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?, Version::V0_3_4_4(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?, Version::V0_3_5(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?, + Version::V0_3_5_1(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?, Version::Other(_) => { return Err(Error::new( eyre!("Cannot downgrade"), @@ -208,6 +212,9 @@ mod tests { Just(Version::V0_3_4_1(Wrapper(v0_3_4_1::Version::new()))), Just(Version::V0_3_4_2(Wrapper(v0_3_4_2::Version::new()))), Just(Version::V0_3_4_3(Wrapper(v0_3_4_3::Version::new()))), + Just(Version::V0_3_4_4(Wrapper(v0_3_4_4::Version::new()))), + Just(Version::V0_3_5(Wrapper(v0_3_5::Version::new()))), + Just(Version::V0_3_5_1(Wrapper(v0_3_5_1::Version::new()))), em_version().prop_map(Version::Other), ] } diff --git a/core/startos/src/version/v0_3_5_1.rs b/core/startos/src/version/v0_3_5_1.rs new file mode 100644 index 000000000..c004dc8b6 --- /dev/null +++ b/core/startos/src/version/v0_3_5_1.rs @@ -0,0 +1,32 @@ +use async_trait::async_trait; +use emver::VersionRange; +use sqlx::PgPool; + +use super::v0_3_4::V0_3_0_COMPAT; +use super::{v0_3_5, VersionT}; +use crate::prelude::*; + +const V0_3_5_1: emver::Version = emver::Version::new(0, 3, 5, 1); + +#[derive(Clone, Debug)] +pub struct Version; + +#[async_trait] +impl VersionT for Version { + type Previous = v0_3_5::Version; + fn new() -> Self { + Version + } + fn semver(&self) -> emver::Version { + V0_3_5_1 + } + fn compat(&self) -> &'static VersionRange { + &V0_3_0_COMPAT + } + async fn up(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> { + Ok(()) + } + async fn down(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> { + Ok(()) + } +} diff --git a/image-recipe/build.sh b/image-recipe/build.sh index bfc7921d9..633944642 100755 --- a/image-recipe/build.sh +++ b/image-recipe/build.sh @@ -158,8 +158,8 @@ echo "deb [arch=${IB_TARGET_ARCH} signed-by=/etc/apt/trusted.gpg.d/tor.key.gpg] curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o config/archives/docker.key echo "deb [arch=${IB_TARGET_ARCH} signed-by=/etc/apt/trusted.gpg.d/docker.key.gpg] https://download.docker.com/linux/debian ${IB_SUITE} stable" > config/archives/docker.list -curl -fsSL https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/Debian_Testing/Release.key | gpg --dearmor -o config/archives/podman.key -echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/podman.key.gpg] https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/Debian_Testing/ /" > config/archives/podman.list +curl -fsSL https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/Debian_Testing/Release.key | gpg --dearmor -o config/archives/podman.key +echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/podman.key.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/Debian_Testing/ /" > config/archives/podman.list # Dependencies diff --git a/system-images/compat/Cargo.lock b/system-images/compat/Cargo.lock index 0c646aebf..9ce44203a 100644 --- a/system-images/compat/Cargo.lock +++ b/system-images/compat/Cargo.lock @@ -4399,7 +4399,7 @@ dependencies = [ [[package]] name = "start-os" -version = "0.3.5" +version = "0.3.5-rev.1" dependencies = [ "aes", "async-compression", From 8cf0ae0994fbdd03ecbf378062965a2868720513 Mon Sep 17 00:00:00 2001 From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com> Date: Thu, 16 Nov 2023 06:04:35 -0700 Subject: [PATCH 4/6] play song unconditionally (#2518) * play song unconditionally * double bep-bep frequency * play song during firmware update --------- Co-authored-by: J H <2364004+Blu-J@users.noreply.github.com> --- core/startos/src/bins/start_init.rs | 15 ++++++++++++++- core/startos/src/init.rs | 14 -------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/core/startos/src/bins/start_init.rs b/core/startos/src/bins/start_init.rs index f189c3723..bafde4c74 100644 --- a/core/startos/src/bins/start_init.rs +++ b/core/startos/src/bins/start_init.rs @@ -3,6 +3,7 @@ use std::path::{Path, PathBuf}; use std::sync::Arc; use std::time::Duration; +use helpers::NonDetachingJoinHandle; use tokio::process::Command; use tracing::instrument; @@ -15,12 +16,20 @@ use crate::firmware::update_firmware; use crate::init::STANDBY_MODE_PATH; use crate::net::web_server::WebServer; use crate::shutdown::Shutdown; -use crate::sound::CHIME; +use crate::sound::{BEP, CHIME}; use crate::util::Invoke; use crate::{Error, ErrorKind, ResultExt, PLATFORM}; #[instrument(skip_all)] async fn setup_or_init(cfg_path: Option) -> Result, Error> { + let song = NonDetachingJoinHandle::from(tokio::spawn(async { + loop { + BEP.play().await.unwrap(); + BEP.play().await.unwrap(); + tokio::time::sleep(Duration::from_secs(30)).await; + } + })); + if update_firmware().await?.0 { return Ok(Some(Shutdown { export_args: None, @@ -74,6 +83,7 @@ async fn setup_or_init(cfg_path: Option) -> Result, Er ) .await?; + drop(song); tokio::time::sleep(Duration::from_secs(1)).await; // let the record state that I hate this CHIME.play().await?; @@ -100,8 +110,10 @@ async fn setup_or_init(cfg_path: Option) -> Result, Er ) .await?; + drop(song); tokio::time::sleep(Duration::from_secs(1)).await; // let the record state that I hate this CHIME.play().await?; + ctx.shutdown .subscribe() .recv() @@ -152,6 +164,7 @@ async fn setup_or_init(cfg_path: Option) -> Result, Er } tracing::info!("Loaded Disk"); crate::init::init(&cfg).await?; + drop(song); } Ok(None) diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs index 097696dac..e5accb992 100644 --- a/core/startos/src/init.rs +++ b/core/startos/src/init.rs @@ -230,18 +230,6 @@ pub async fn init(cfg: &RpcContextConfig) -> Result { || &*server_info.version < &emver::Version::new(0, 3, 2, 0) || (*ARCH == "x86_64" && &*server_info.version < &emver::Version::new(0, 3, 4, 0)); - let song = if should_rebuild { - Some(NonDetachingJoinHandle::from(tokio::spawn(async { - loop { - BEP.play().await.unwrap(); - BEP.play().await.unwrap(); - tokio::time::sleep(Duration::from_secs(60)).await; - } - }))) - } else { - None - }; - let log_dir = cfg.datadir().join("main/logs"); if tokio::fs::metadata(&log_dir).await.is_err() { tokio::fs::create_dir_all(&log_dir).await?; @@ -446,8 +434,6 @@ pub async fn init(cfg: &RpcContextConfig) -> Result { }?; } - drop(song); - tracing::info!("System initialized."); Ok(InitResult { secret_store, db }) From e631b145b9d8170958276605e64493a739eb997c Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Thu, 16 Nov 2023 11:06:24 -0700 Subject: [PATCH 5/6] bump web manifest version --- web/projects/ui/src/manifest.webmanifest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/projects/ui/src/manifest.webmanifest b/web/projects/ui/src/manifest.webmanifest index a199ac1dd..fee3469fc 100644 --- a/web/projects/ui/src/manifest.webmanifest +++ b/web/projects/ui/src/manifest.webmanifest @@ -5,8 +5,8 @@ "background_color": "#1e1e1e", "display": "standalone", "scope": ".", - "start_url": "/?version=035", - "id": "/?version=035", + "start_url": "/?version=0351", + "id": "/?version=0351", "icons": [ { "src": "assets/img/icon.png", From fbc94cfbfc02ec5c54b03aac19b7eed74d986cb3 Mon Sep 17 00:00:00 2001 From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com> Date: Thu, 16 Nov 2023 14:48:33 -0700 Subject: [PATCH 6/6] allow non-zero exit `cpupower frequency-info -g` (#2523) * set better governor hierarchy and add cli command to change * allow non-zero exit `cpupower frequency-info -g` --- core/startos/src/util/cpupower.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/core/startos/src/util/cpupower.rs b/core/startos/src/util/cpupower.rs index 7fa850a88..cc4ac5ef4 100644 --- a/core/startos/src/util/cpupower.rs +++ b/core/startos/src/util/cpupower.rs @@ -39,13 +39,12 @@ impl std::borrow::Borrow for Governor { } pub async fn get_available_governors() -> Result, Error> { - let raw = String::from_utf8( - Command::new("cpupower") - .arg("frequency-info") - .arg("-g") - .invoke(ErrorKind::CpuSettings) - .await?, - )?; + let raw = Command::new("cpupower") + .arg("frequency-info") + .arg("-g") + .invoke(ErrorKind::CpuSettings) + .await + .map_or_else(|e| Ok(e.source.to_string()), String::from_utf8)?; let mut for_cpu: OrdMap> = OrdMap::new(); let mut current_cpu = None; for line in raw.lines() {