lix-project/lix-installer
16
4
Fork 4
Code Issues 23 Code Review (Gerrit) Projects Activity

Don't check /run for systemd if we're not starting the daemon (#853)

Browse source 
* Don't check /run for systemd if we're not starting the daemon

* Add a note about start_daemon and checking /run/systemd/system
This commit is contained in:
Ana Hobden 2024-02-23 08:41:41 -08:00 committed by GitHub
parent 09ddc9be6b
commit 40740423ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/action/common/configure_init_service.rs
View file

@ -79,10 +79,14 @@ impl ConfigureInitService {
}, },
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
InitSystem::Systemd => { InitSystem::Systemd => {
// If /run/systemd/system exists, we can be reasonably sure the machine is booted // If `no_start_daemon` is set, then we don't require a running systemd,
// with systemd: https://www.freedesktop.org/software/systemd/man/sd_booted.html // so we don't need to check if `/run/systemd/system` exists.
if !Path::new("/run/systemd/system").exists() { if start_daemon {
return Err(Self::error(ActionErrorKind::SystemdMissing)); // If /run/systemd/system exists, we can be reasonably sure the machine is booted
// with systemd: https://www.freedesktop.org/software/systemd/man/sd_booted.html
if !Path::new("/run/systemd/system").exists() {
return Err(Self::error(ActionErrorKind::SystemdMissing));
}
} }
if which::which("systemctl").is_err() { if which::which("systemctl").is_err() {