public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/grub: Fix spacing and correct subvolume detection

Browse Source
This commit is contained in:
William A. Kennington III 2014-05-02 03:37:50 -05:00
parent cc62623b37
commit 0f6079d999
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/system/boot/loader/grub/install-grub.pl
View File

@ -72,10 +72,10 @@ struct(Fs => {
}); });
sub GetFs { sub GetFs {
my ($dir) = @_; my ($dir) = @_;
my ($status, @dfOut) = runCommand("df -T $dir"); my ($status, @dfOut) = runCommand("df -T $dir");
if ($status != 0 || $#dfOut != 1) { if ($status != 0 || $#dfOut != 1) {
die "Failed to retrieve output about $dir from `df`"; die "Failed to retrieve output about $dir from `df`";
} }
my @boot = split(/[ \n\t]+/, $dfOut[1]); my @boot = split(/[ \n\t]+/, $dfOut[1]);
return Fs->new(device => $boot[0], type => $boot[1], mount => $boot[6]); return Fs->new(device => $boot[0], type => $boot[1], mount => $boot[6]);
} }
@ -133,16 +133,16 @@ sub GrubFs {
# BTRFS is a special case in that we need to fix the referrenced path based on subvolumes # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes
if ($fs->type eq 'btrfs') { if ($fs->type eq 'btrfs') {
my ($status, @info) = runCommand("btrfs subvol show @{[$fs->device]}"); my ($status, @info) = runCommand("btrfs subvol show @{[$fs->mount]}");
if ($status != 0) { if ($status != 0) {
die "Failed to retreive subvolume info for @{[$fs->device]}"; die "Failed to retreive subvolume info for @{[$fs->mount]}";
} }
my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/; my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/;
if ($#subvols > 0) { if ($#subvols > 0) {
die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n" die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n"
} elsif ($#subvols == 0) { } elsif ($#subvols == 0) {
$path = "/$subvols[0]$path"; $path = "/$subvols[0]$path";
} }
} }
} }
if (not $search eq "") { if (not $search eq "") {