diff options
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/activation/switch-to-configuration.pl | 19 | ||||
| -rw-r--r-- | nixos/modules/system/activation/top-level.nix | 3 |
2 files changed, 11 insertions, 11 deletions
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 2ce04ed5342c..87a4ab2a586d 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -4,7 +4,6 @@ use strict; use warnings; use File::Basename; use File::Slurp; -use Net::DBus; use Sys::Syslog qw(:standard :macros); use Cwd 'abs_path'; @@ -68,15 +67,17 @@ EOF $SIG{PIPE} = "IGNORE"; sub getActiveUnits { - my $mgr = Net::DBus->system->get_service("org.freedesktop.systemd1")->get_object("/org/freedesktop/systemd1"); - my $units = $mgr->ListUnitsByPatterns([], []); + # FIXME: use D-Bus or whatever to query this, since parsing the + # output of list-units is likely to break. + # Use current version of systemctl binary before daemon is reexeced. + my $lines = `LANG= /run/current-system/sw/bin/systemctl list-units --full --no-legend`; my $res = {}; - for my $item (@$units) { - my ($id, $description, $load_state, $active_state, $sub_state, - $following, $unit_path, $job_id, $job_type, $job_path) = @$item; - next unless $following eq ''; - next if $job_id == 0 and $active_state eq 'inactive'; - $res->{$id} = { load => $load_state, state => $active_state, substate => $sub_state }; + foreach my $line (split '\n', $lines) { + chomp $line; + last if $line eq ""; + $line =~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next; + next if $1 eq "UNIT"; + $res->{$1} = { load => $2, state => $3, substate => $4 }; } return $res; } diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index f4af9a580fde..091a2e412eed 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -127,8 +127,7 @@ let configurationName = config.boot.loader.grub.configurationName; # Needed by switch-to-configuration. - - perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ])); + perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl"; } else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}"); # Replace runtime dependencies |