Commit a06868fb authored by K900's avatar K900
Browse files

switch-to-configuration-ng: get runtime directory from logind instead of hardcoding 

Correctness fix, shouldn't actually matter ~ever.
parent 88dbefd1

pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs

+11 −7
Original line number Diff line number Diff line
@@ -1657,15 +1657,19 @@ won't take effect until you reboot the system. 
        }

        Ok(users) => {

            for (uid, name, user_dbus_path) in users {

                let gid: u32 = dbus_conn

                    .with_proxy(

                let proxy = dbus_conn.with_proxy(

                    "org.freedesktop.login1",

                    &user_dbus_path,

                    Duration::from_millis(5000),

                    )

                );

                let gid: u32 = proxy

                    .get("org.freedesktop.login1.User", "GID")

                    .with_context(|| format!("Failed to get GID for {name}"))?;



                let runtime_path: String = proxy

                    .get("org.freedesktop.login1.User", "RuntimePath")

                    .with_context(|| format!("Failed to get runtime directory for {name}"))?;



                eprintln!("reloading user units for {}...", name);

                let myself = Path::new("/proc/self/exe")

                    .canonicalize()
@@ -1674,7 +1678,7 @@ won't take effect until you reboot the system. 
                std::process::Command::new(&myself)

                    .uid(uid)

                    .gid(gid)

                    .env("XDG_RUNTIME_DIR", format!("/run/user/{}", uid))

                    .env("XDG_RUNTIME_DIR", runtime_path)

                    .env("__NIXOS_SWITCH_TO_CONFIGURATION_PARENT_EXE", &myself)

                    .spawn()

                    .with_context(|| format!("Failed to spawn user activation for {name}"))?