diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-07-06 10:22:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-06 10:22:26 +0200 |
commit | e9aedc3006868dfbbf4b0ee0390a88a8c6322722 (patch) | |
tree | 4bd4c5cae89d5730028d8cf60074e48218324c66 | |
parent | 6876eab511afd1c10b8e89a1ff99aa28c6a44b2d (diff) | |
parent | aeb516c741a1156a66acafa14322b47c63cfd709 (diff) | |
download | nixlib-e9aedc3006868dfbbf4b0ee0390a88a8c6322722.tar nixlib-e9aedc3006868dfbbf4b0ee0390a88a8c6322722.tar.gz nixlib-e9aedc3006868dfbbf4b0ee0390a88a8c6322722.tar.bz2 nixlib-e9aedc3006868dfbbf4b0ee0390a88a8c6322722.tar.lz nixlib-e9aedc3006868dfbbf4b0ee0390a88a8c6322722.tar.xz nixlib-e9aedc3006868dfbbf4b0ee0390a88a8c6322722.tar.zst nixlib-e9aedc3006868dfbbf4b0ee0390a88a8c6322722.zip |
Merge pull request #16738 from bjornfor/nixos-grub
nixos/grub: change state file device separator from ':' to ','
-rw-r--r-- | nixos/modules/system/boot/loader/grub/install-grub.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index b8ef02da4bc2..94d87b436065 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -501,7 +501,7 @@ sub getEfiTarget { my @deviceTargets = getDeviceTargets(); my $efiTarget = getEfiTarget(); my $prevGrubState = readGrubState(); -my @prevDeviceTargets = split/:/, $prevGrubState->devices; +my @prevDeviceTargets = split/,/, $prevGrubState->devices; my $devicesDiffer = scalar (List::Compare->new( '-u', '-a', \@deviceTargets, \@prevDeviceTargets)->get_symmetric_difference()); my $nameDiffer = get("fullName") ne $prevGrubState->name; @@ -549,7 +549,7 @@ if ($requireNewInstall != 0) { print FILE get("fullName"), "\n" or die; print FILE get("fullVersion"), "\n" or die; print FILE $efiTarget, "\n" or die; - print FILE join( ":", @deviceTargets ), "\n" or die; + print FILE join( ",", @deviceTargets ), "\n" or die; print FILE $efiSysMountPoint, "\n" or die; close FILE or die; } |