From 4caab8d3b890cce16506e96b116ed0f47892af5f Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Thu, 11 May 2023 14:19:45 -0600 Subject: [PATCH] changes needed due to rebase --- backend/src/bin/embassy-init.rs | 2 +- backend/src/os_install/mod.rs | 2 +- libs/models/src/errors.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/bin/embassy-init.rs b/backend/src/bin/embassy-init.rs index 6b85cfa40..1bc079c58 100644 --- a/backend/src/bin/embassy-init.rs +++ b/backend/src/bin/embassy-init.rs @@ -55,7 +55,7 @@ async fn setup_or_init(cfg_path: Option) -> Result<(), Error> { .await .is_err() { - embassy::hostname::sync_hostname(&embassy::hostname::Hostname("embassy".into())).await?; + embassy::hostname::sync_hostname(&embassy::hostname::Hostname("start".into())).await?; let ctx = SetupContext::init(cfg_path).await?; diff --git a/backend/src/os_install/mod.rs b/backend/src/os_install/mod.rs index 8b32acf20..4bf3333c7 100644 --- a/backend/src/os_install/mod.rs +++ b/backend/src/os_install/mod.rs @@ -232,7 +232,7 @@ pub async fn execute( .invoke(crate::ErrorKind::OpenSsh) .await?; - tokio::fs::write(current.join("etc/hostname"), "embassy\n").await?; + tokio::fs::write(current.join("etc/hostname"), "start\n").await?; Command::new("chroot") .arg(¤t) diff --git a/libs/models/src/errors.rs b/libs/models/src/errors.rs index 245409416..332560f7b 100644 --- a/libs/models/src/errors.rs +++ b/libs/models/src/errors.rs @@ -130,7 +130,7 @@ impl ErrorKind { DiskManagement => "Disk Management Error", OpenSsl => "OpenSSL Internal Error", PasswordHashGeneration => "Password Hash Generation Error", - DiagnosticMode => "Embassy is in Diagnostic Mode", + DiagnosticMode => "Server is in Diagnostic Mode", ParseDbField => "Database Field Parse Error", Duplicate => "Duplication Error", MultipleErrors => "Multiple Errors",