diff options
| author | Thomas Strobel <ts468@cam.ac.uk> | 2015-07-05 20:54:36 +0200 |
|---|---|---|
| committer | Thomas Strobel <ts468@cam.ac.uk> | 2015-07-05 21:55:56 +0200 |
| commit | 4ee2d39fbf60e4414d27961e7e0ddf4805719500 (patch) | |
| tree | 83c113d4f6747127fdf12bfcfa6bc0bb2983298a /nixos | |
| parent | 282e7e6c84476bb12cc50d73bce998ac7aaf2364 (diff) | |
| download | nixlib-4ee2d39fbf60e4414d27961e7e0ddf4805719500.tar nixlib-4ee2d39fbf60e4414d27961e7e0ddf4805719500.tar.gz nixlib-4ee2d39fbf60e4414d27961e7e0ddf4805719500.tar.bz2 nixlib-4ee2d39fbf60e4414d27961e7e0ddf4805719500.tar.lz nixlib-4ee2d39fbf60e4414d27961e7e0ddf4805719500.tar.xz nixlib-4ee2d39fbf60e4414d27961e7e0ddf4805719500.tar.zst nixlib-4ee2d39fbf60e4414d27961e7e0ddf4805719500.zip | |
grub installation: fix: simplify code
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/install-grub.pl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index de0a4c7f0567..e8cd45e82215 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -499,11 +499,11 @@ my $efiTarget = getEfiTarget(); my $prevGrubState = readGrubState(); my @prevDeviceTargets = split/:/, $prevGrubState->devices; -my $devicesDiffer = scalar (List::Compare->new( '-u', '-a', \@deviceTargets, \@prevDeviceTargets)->get_symmetric_difference() ); -my $nameDiffer = !(get("fullName") eq $prevGrubState->name); -my $versionDiffer = !(get("fullVersion") eq $prevGrubState->version); -my $efiDiffer = !($efiTarget eq $prevGrubState->efi); -my $efiMountPointDiffer = !($efiSysMountPoint eq $prevGrubState->efiMountPoint); +my $devicesDiffer = scalar (List::Compare->new( '-u', '-a', \@deviceTargets, \@prevDeviceTargets)->get_symmetric_difference()); +my $nameDiffer = get("fullName") ne $prevGrubState->name; +my $versionDiffer = get("fullVersion") ne $prevGrubState->version; +my $efiDiffer = $efiTarget ne $prevGrubState->efi; +my $efiMountPointDiffer = $efiSysMountPoint ne $prevGrubState->efiMountPoint; my $requireNewInstall = $devicesDiffer || $nameDiffer || $versionDiffer || $efiDiffer || $efiMountPointDiffer || (($ENV{'NIXOS_INSTALL_GRUB'} // "") eq "1"); # install a symlink so that grub can detect the boot drive when set |