diff options
author | Aristid Breitkreuz <aristidb@gmail.com> | 2014-08-30 15:11:42 +0200 |
---|---|---|
committer | Aristid Breitkreuz <aristidb@gmail.com> | 2014-08-30 15:11:42 +0200 |
commit | 032e93b9ab80bfb47b2ebc34bda438857d416499 (patch) | |
tree | 3f6c999899af9f4a5e34a16a8b9d2aac20968ea1 | |
parent | 4210665c4f349d95685d14a8eacf21c3cf9e030c (diff) | |
parent | 7d16a429f0e4ded151398da5433b817166ea8404 (diff) | |
download | nixlib-032e93b9ab80bfb47b2ebc34bda438857d416499.tar nixlib-032e93b9ab80bfb47b2ebc34bda438857d416499.tar.gz nixlib-032e93b9ab80bfb47b2ebc34bda438857d416499.tar.bz2 nixlib-032e93b9ab80bfb47b2ebc34bda438857d416499.tar.lz nixlib-032e93b9ab80bfb47b2ebc34bda438857d416499.tar.xz nixlib-032e93b9ab80bfb47b2ebc34bda438857d416499.tar.zst nixlib-032e93b9ab80bfb47b2ebc34bda438857d416499.zip |
Merge pull request #3863 from wkennington/master.grubfix
Fix perl indentation
-rw-r--r-- | nixos/modules/installer/tools/nixos-generate-config.pl | 26 | ||||
-rw-r--r-- | nixos/modules/system/boot/loader/grub/install-grub.pl | 6 |
2 files changed, 16 insertions, 16 deletions
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index cabdb09ec9c1..73dd87cef5cf 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -344,19 +344,19 @@ EOF } } - # Is this a btrfs filesystem? - if ($fsType eq "btrfs") { - my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint"); - if ($status != 0) { - die "Failed to retreive subvolume info for $mountPoint"; - } - my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/; - if ($#subvols > 0) { - die "Btrfs subvol name for $mountPoint listed multiple times in mount\n" - } elsif ($#subvols == 0) { - push @extraOptions, "subvol=$subvols[0]"; - } - } + # Is this a btrfs filesystem? + if ($fsType eq "btrfs") { + my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint"); + if ($status != 0) { + die "Failed to retreive subvolume info for $mountPoint"; + } + my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/; + if ($#subvols > 0) { + die "Btrfs subvol name for $mountPoint listed multiple times in mount\n" + } elsif ($#subvols == 0) { + push @extraOptions, "subvol=$subvols[0]"; + } + } # Emit the filesystem. $fileSystems .= <<EOF; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index d8ee8b500970..7ced51f57e16 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -158,7 +158,7 @@ my $grubStore = GrubFs("/nix"); # We don't need to copy if we can read the kernels directly if ($grubStore->search ne "") { - $copyKernels = 0; + $copyKernels = 0; } # Generate the header. @@ -275,8 +275,8 @@ sub addEntry { $conf .= " " . ($xen ? "module" : "initrd") . " $initrd\n\n"; } else { $conf .= "menuentry \"$name\" {\n"; - $conf .= $grubBoot->search . "\n"; - $conf .= $grubStore->search . "\n"; + $conf .= $grubBoot->search . "\n"; + $conf .= $grubStore->search . "\n"; $conf .= " $extraPerEntryConfig\n" if $extraPerEntryConfig; $conf .= " multiboot $xen $xenParams\n" if $xen; $conf .= " " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n"; |