commit 6b0cf5f88fb3cd9f7589da9255f25c59b39ff5c9 · pyrox.dev/nixpkgs

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

···

       18
        
       

     

       19
        
           let out_path = std::path::PathBuf::from(std::env::var("OUT_DIR").unwrap());

     

       20
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       21
        
           let systemd_manager_code =

     

       22
        
               code_for_dbus_xml(systemd_dbus_interface_dir.join("org.freedesktop.systemd1.Manager.xml"));

     

       23
        
           let mut file = std::fs::File::create(out_path.join("systemd_manager.rs")).unwrap();

···

       18
        
       

     

       19
        
           let out_path = std::path::PathBuf::from(std::env::var("OUT_DIR").unwrap());

     

       20
        
       

     

       21
       +
           let fdo_dbus_code = code_for_dbus_xml("org.freedesktop.DBus.xml");

     

       22
       +
           let mut file = std::fs::File::create(out_path.join("fdo_dbus.rs")).unwrap();

     

       23
       +
           file.write_all(fdo_dbus_code.as_bytes()).unwrap();

     

       24
       +
       

     

       25
        
           let systemd_manager_code =

     

       26
        
               code_for_dbus_xml(systemd_dbus_interface_dir.join("org.freedesktop.systemd1.Manager.xml"));

     

       27
        
           let mut file = std::fs::File::create(out_path.join("systemd_manager.rs")).unwrap();

+12

pkgs/by-name/sw/switch-to-configuration-ng/src/org.freedesktop.DBus.xml

···

       1
       +
       <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"

     

       2
       +
       "https://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">

     

       3
       +
       <node>

     

       4
       +
         <!-- From https://dbus.freedesktop.org/doc/dbus-specification.html#message-bus-messages. -->

     

       5
       +
         <interface name="org.freedesktop.DBus">

     

       6
       +
           <signal name="NameOwnerChanged">

     

       7
       +
             <arg type="s" direction="out" name="name"/>

     

       8
       +
             <arg type="s" direction="out" name="old_owner"/>

     

       9
       +
             <arg type="s" direction="out" name="new_owner"/>

     

       10
       +
           </signal>

     

       11
       +
         </interface>

     

       12
       +
       </node>

+91 -22

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

···

       17
        
       use anyhow::{anyhow, bail, Context, Result};

     

       18
        
       use dbus::{

     

       19
        
           blocking::{stdintf::org_freedesktop_dbus::Properties, LocalConnection, Proxy},

     

       0
        
       
     

       0
        
       
     

       20
        
           Message,

     

       21
        
       };

     

       22
        
       use glob::glob;

     
···

       32
        
       use regex::Regex;

     

       33
        
       use syslog::Facility;

     

       34
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       35
        
       mod systemd_manager {

     

       36
        
           #![allow(non_upper_case_globals)]

     

       37
        
           #![allow(non_camel_case_types)]

     
···

       50
        
           include!(concat!(env!("OUT_DIR"), "/logind_manager.rs"));

     

       51
        
       }

     

       52
        
       

     

       53
       -
       use crate::systemd_manager::OrgFreedesktopSystemd1Manager;

     

       0
        
       
     

       0
        
       
     

       54
        
       use crate::{

     

       55
        
           logind_manager::OrgFreedesktopLogin1Manager,

     

       56
        
           systemd_manager::{

     
···

       894
        
           }

     

       895
        
       }

     

       896
        
       

     

       897
       -
       fn new_dbus_proxies(

     

       898
       -
           conn: &LocalConnection,

     

       899
       -
       ) -> (Proxy<'_, &LocalConnection>, Proxy<'_, &LocalConnection>) {

     

       900
       -
           (

     

       901
       -
               conn.with_proxy(

     

       902
       -
                   "org.freedesktop.systemd1",

     

       903
       -
                   "/org/freedesktop/systemd1",

     

       904
       -
                   Duration::from_millis(10000),

     

       905
       -
               ),

     

       906
       -
               conn.with_proxy(

     

       907
       -
                   "org.freedesktop.login1",

     

       908
       -
                   "/org/freedesktop/login1",

     

       909
       -
                   Duration::from_millis(10000),

     

       910
       -
               ),

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       911
        
           )

     

       912
        
       }

     

       913
        
       

     
···

       931
        
           }

     

       932
        
       }

     

       933
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       934
        
       /// Performs switch-to-configuration functionality for a single non-root user

     

       935
        
       fn do_user_switch(parent_exe: String) -> anyhow::Result<()> {

     

       936
        
           if Path::new(&parent_exe)

     
···

       946
        
           }

     

       947
        
       

     

       948
        
           let dbus_conn = LocalConnection::new_session().context("Failed to open dbus connection")?;

     

       949
       -
           let (systemd, _) = new_dbus_proxies(&dbus_conn);

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       950
        
       

     

       951
        
           let nixos_activation_done = Rc::new(RefCell::new(false));

     

       952
        
           let _nixos_activation_done = nixos_activation_done.clone();

     
···

       963
        
                   },

     

       964
        
               )

     

       965
        
               .context("Failed to add signal match for systemd removed jobs")?;

     

       966
       -
       

     

       967
       -
           // The systemd user session seems to not send a Reloaded signal, so we don't have anything to

     

       968
       -
           // wait on here.

     

       969
       -
           _ = systemd.reexecute();

     

       970
        
       

     

       971
        
           systemd

     

       972
        
               .restart_unit("nixos-activation.service", "replace")

     
···

       1140
        
           let mut units_to_reload = map_from_list_file(RELOAD_LIST_FILE);

     

       1141
        
       

     

       1142
        
           let dbus_conn = LocalConnection::new_system().context("Failed to open dbus connection")?;

     

       1143
       -
           let (systemd, logind) = new_dbus_proxies(&dbus_conn);

     

       0
        
       
     

       0
        
       
     

       1144
        
       

     

       1145
        
           let submitted_jobs = Rc::new(RefCell::new(HashMap::new()));

     

       1146
        
           let finished_jobs = Rc::new(RefCell::new(HashMap::new()));

     
···

       1664
        
           // just in case the new one has trouble communicating with the running pid 1.

     

       1665
        
           if restart_systemd {

     

       1666
        
               eprintln!("restarting systemd...");

     

       1667
       -
               _ = systemd.reexecute(); // we don't get a dbus reply here

     

       1668
        
       

     

       1669
        
               log::debug!("waiting for systemd restart to finish");

     

       1670
        
               while !*systemd_reload_status.borrow() {

···

       17
        
       use anyhow::{anyhow, bail, Context, Result};

     

       18
        
       use dbus::{

     

       19
        
           blocking::{stdintf::org_freedesktop_dbus::Properties, LocalConnection, Proxy},

     

       20
       +
           channel::Sender,

     

       21
       +
           strings::{BusName, Interface, Member},

     

       22
        
           Message,

     

       23
        
       };

     

       24
        
       use glob::glob;

     
···

       34
        
       use regex::Regex;

     

       35
        
       use syslog::Facility;

     

       36
        
       

     

       37
       +
       mod fdo_dbus {

     

       38
       +
           #![allow(non_upper_case_globals)]

     

       39
       +
           #![allow(non_camel_case_types)]

     

       40
       +
           #![allow(non_snake_case)]

     

       41
       +
           #![allow(unused)]

     

       42
       +
           #![allow(clippy::all)]

     

       43
       +
           include!(concat!(env!("OUT_DIR"), "/fdo_dbus.rs"));

     

       44
       +
       }

     

       45
       +
       

     

       46
        
       mod systemd_manager {

     

       47
        
           #![allow(non_upper_case_globals)]

     

       48
        
           #![allow(non_camel_case_types)]

     
···

       61
        
           include!(concat!(env!("OUT_DIR"), "/logind_manager.rs"));

     

       62
        
       }

     

       63
        
       

     

       64
       +
       use crate::{

     

       65
       +
           fdo_dbus::OrgFreedesktopDBusNameOwnerChanged, systemd_manager::OrgFreedesktopSystemd1Manager,

     

       66
       +
       };

     

       67
        
       use crate::{

     

       68
        
           logind_manager::OrgFreedesktopLogin1Manager,

     

       69
        
           systemd_manager::{

     
···

       907
        
           }

     

       908
        
       }

     

       909
        
       

     

       910
       +
       fn fdo_dbus_proxy(conn: &LocalConnection) -> Proxy<'_, &LocalConnection> {

     

       911
       +
           conn.with_proxy(

     

       912
       +
               "org.freedesktop.DBus",

     

       913
       +
               "/org/freedesktop/DBus",

     

       914
       +
               Duration::from_millis(500),

     

       915
       +
           )

     

       916
       +
       }

     

       917
       +
       

     

       918
       +
       fn systemd1_proxy(conn: &LocalConnection) -> Proxy<'_, &LocalConnection> {

     

       919
       +
           conn.with_proxy(

     

       920
       +
               "org.freedesktop.systemd1",

     

       921
       +
               "/org/freedesktop/systemd1",

     

       922
       +
               Duration::from_millis(10000),

     

       923
       +
           )

     

       924
       +
       }

     

       925
       +
       

     

       926
       +
       fn login1_proxy(conn: &LocalConnection) -> Proxy<'_, &LocalConnection> {

     

       927
       +
           conn.with_proxy(

     

       928
       +
               "org.freedesktop.login1",

     

       929
       +
               "/org/freedesktop/login1",

     

       930
       +
               Duration::from_millis(10000),

     

       931
        
           )

     

       932
        
       }

     

       933
        
       

     
···

       951
        
           }

     

       952
        
       }

     

       953
        
       

     

       954
       +
       fn reexecute_systemd_manager(

     

       955
       +
           dbus_conn: &LocalConnection,

     

       956
       +
           fdo_dbus: &Proxy<'_, &LocalConnection>,

     

       957
       +
       ) -> anyhow::Result<()> {

     

       958
       +
           let reexecute_done = Rc::new(RefCell::new(false));

     

       959
       +
           let _reexecute_done = reexecute_done.clone();

     

       960
       +
           let owner_changed_token = fdo_dbus

     

       961
       +
               .match_signal(

     

       962
       +
                   move |signal: OrgFreedesktopDBusNameOwnerChanged, _: &LocalConnection, _: &Message| {

     

       963
       +
                       if signal.name.as_str() == "org.freedesktop.systemd1" {

     

       964
       +
                           *_reexecute_done.borrow_mut() = true;

     

       965
       +
                       }

     

       966
       +
       

     

       967
       +
                       true

     

       968
       +
                   },

     

       969
       +
               )

     

       970
       +
               .context("Failed to add signal match for DBus name owner changes")?;

     

       971
       +
       

     

       972
       +
           let bus_name = BusName::from("org.freedesktop.systemd1");

     

       973
       +
           let object_path = dbus::Path::from("/org/freedesktop/systemd1");

     

       974
       +
           let interface = Interface::new("org.freedesktop.systemd1.Manager")

     

       975
       +
               .expect("the org.freedesktop.systemd1.Manager interface name should be valid");

     

       976
       +
           let method_name = Member::new("Reexecute").expect("the Reexecute method name should be valid");

     

       977
       +
       

     

       978
       +
           // Systemd does not reply to the Reexecute method.

     

       979
       +
           let _serial = dbus_conn

     

       980
       +
               .send(Message::method_call(

     

       981
       +
                   &bus_name,

     

       982
       +
                   &object_path,

     

       983
       +
                   &interface,

     

       984
       +
                   &method_name,

     

       985
       +
               ))

     

       986
       +
               .map_err(|_err| anyhow!("Failed to send org.freedesktop.systemd1.Manager.Reexecute"))?;

     

       987
       +
       

     

       988
       +
           log::debug!("waiting for systemd to finish reexecuting");

     

       989
       +
           while !*reexecute_done.borrow() {

     

       990
       +
               _ = dbus_conn

     

       991
       +
                   .process(Duration::from_secs(500))

     

       992
       +
                   .context("Failed to process dbus messages")?;

     

       993
       +
           }

     

       994
       +
       

     

       995
       +
           dbus_conn

     

       996
       +
               .remove_match(owner_changed_token)

     

       997
       +
               .context("Failed to remove jobs token")?;

     

       998
       +
       

     

       999
       +
           Ok(())

     

       1000
       +
       }

     

       1001
       +
       

     

       1002
        
       /// Performs switch-to-configuration functionality for a single non-root user

     

       1003
        
       fn do_user_switch(parent_exe: String) -> anyhow::Result<()> {

     

       1004
        
           if Path::new(&parent_exe)

     
···

       1014
        
           }

     

       1015
        
       

     

       1016
        
           let dbus_conn = LocalConnection::new_session().context("Failed to open dbus connection")?;

     

       1017
       +
           let fdo_dbus = fdo_dbus_proxy(&dbus_conn);

     

       1018
       +
           let systemd = systemd1_proxy(&dbus_conn);

     

       1019
       +
       

     

       1020
       +
           reexecute_systemd_manager(&dbus_conn, &fdo_dbus)?;

     

       1021
        
       

     

       1022
        
           let nixos_activation_done = Rc::new(RefCell::new(false));

     

       1023
        
           let _nixos_activation_done = nixos_activation_done.clone();

     
···

       1034
        
                   },

     

       1035
        
               )

     

       1036
        
               .context("Failed to add signal match for systemd removed jobs")?;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1037
        
       

     

       1038
        
           systemd

     

       1039
        
               .restart_unit("nixos-activation.service", "replace")

     
···

       1207
        
           let mut units_to_reload = map_from_list_file(RELOAD_LIST_FILE);

     

       1208
        
       

     

       1209
        
           let dbus_conn = LocalConnection::new_system().context("Failed to open dbus connection")?;

     

       1210
       +
           let fdo_dbus = fdo_dbus_proxy(&dbus_conn);

     

       1211
       +
           let systemd = systemd1_proxy(&dbus_conn);

     

       1212
       +
           let logind = login1_proxy(&dbus_conn);

     

       1213
        
       

     

       1214
        
           let submitted_jobs = Rc::new(RefCell::new(HashMap::new()));

     

       1215
        
           let finished_jobs = Rc::new(RefCell::new(HashMap::new()));

     
···

       1733
        
           // just in case the new one has trouble communicating with the running pid 1.

     

       1734
        
           if restart_systemd {

     

       1735
        
               eprintln!("restarting systemd...");

     

       1736
       +
               reexecute_systemd_manager(&dbus_conn, &fdo_dbus)?;

     

       1737
        
       

     

       1738
        
               log::debug!("waiting for systemd restart to finish");

     

       1739
        
               while !*systemd_reload_status.borrow() {