main: Add (optional) systemd notify
This commit is contained in:
parent
75173fe697
commit
90d349a8e7
4 changed files with 30 additions and 2 deletions
|
|
@ -14,6 +14,7 @@ pub mod input;
|
|||
mod logger;
|
||||
pub mod shell;
|
||||
pub mod state;
|
||||
pub mod systemd;
|
||||
pub mod utils;
|
||||
pub mod wayland;
|
||||
|
||||
|
|
@ -33,6 +34,8 @@ fn main() -> Result<()> {
|
|||
let mut state = state::State::new(display, socket, event_loop.handle(), event_loop.get_signal(), log);
|
||||
// init backend
|
||||
backend::init_backend_auto(&mut event_loop, &mut state)?;
|
||||
// potentially tell systemd we are setup now
|
||||
systemd::ready(&state);
|
||||
|
||||
// run the event loop
|
||||
event_loop.run(None, &mut state, |state| {
|
||||
|
|
|
|||
23
src/systemd.rs
Normal file
23
src/systemd.rs
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
|
||||
use libsystemd::daemon::{booted, notify, NotifyState};
|
||||
use std::process::Command;
|
||||
use crate::state::State;
|
||||
|
||||
pub fn ready(state: &State) {
|
||||
if booted() {
|
||||
match Command::new("systemctl")
|
||||
.args(["--user", "import-environment", "WAYLAND_DISPLAY"])
|
||||
.env("WAYLAND_DISPLAY", &state.common.socket)
|
||||
.status()
|
||||
{
|
||||
Ok(x) if x.success() => {},
|
||||
Ok(x) => slog_scope::warn!("Failed to import WAYLAND_DISPLAY into systemd (exit code {:?})", x.code()),
|
||||
Err(err) => slog_scope::error!("Failed to run systemctl although booted with systemd: {}", err),
|
||||
};
|
||||
|
||||
if let Err(err) = notify(false, &[NotifyState::Ready]) {
|
||||
slog_scope::error!("Failed to notify systemd: {}", err);
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue