alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

switch-to-configuration: Use systemctl's --no-legend flag

Browse source
This commit is contained in:
Eelco Dolstra 2014-04-25 17:42:09 +02:00
parent 7ddcd7b6b6
commit 37e6e08cde
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/system/activation/switch-to-configuration.pl
View file

@ -65,12 +65,12 @@ $SIG{PIPE} = "IGNORE";
sub getActiveUnits { sub getActiveUnits {
# FIXME: use D-Bus or whatever to query this, since parsing the # FIXME: use D-Bus or whatever to query this, since parsing the
# output of list-units is likely to break. # output of list-units is likely to break.
my $lines = `LANG= @systemd@/bin/systemctl list-units --full`; my $lines = `LANG= @systemd@/bin/systemctl list-units --full --no-legend`;
my $res = {}; my $res = {};
foreach my $line (split '\n', $lines) { foreach my $line (split '\n', $lines) {
chomp $line; chomp $line;
last if $line eq ""; last if $line eq "";
$line =~ /^\*?\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next; $line =~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next;
next if $1 eq "UNIT"; next if $1 eq "UNIT";
$res->{$1} = { load => $2, state => $3, substate => $4 }; $res->{$1} = { load => $2, state => $3, substate => $4 };
} }