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

nixos/grub: Fix some silly perl struct accesses

Browse Source
This commit is contained in:
William A. Kennington III
2014-08-28 13:35:35 -07:00
parent a6e6c85f06
commit 70c11772a6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/system/boot/loader/grub/install-grub.pl
+3 -3
View File
@@ -89,7 +89,7 @@ sub GrubFs {
$path = "/" . substr($fs->device, $sid) . "/@" . $path; $path = "/" . substr($fs->device, $sid) . "/@" . $path;
} }
} else { } else {
my $idCmd = "\$(blkid -o export $fs->device) 2>/dev/null; echo" my $idCmd = "\$(blkid -o export " . $fs->device . ") 2>/dev/null; echo"
switch ($fsIdentifier) { switch ($fsIdentifier) {
case "uuid" { case "uuid" {
$search = "--fs-uuid " . `$idCmd \$UUID`; $search = "--fs-uuid " . `$idCmd \$UUID`;
@@ -112,9 +112,9 @@ sub GrubFs {
} }
} }
if ($fs->type eq "btrfs") { if ($fs->type eq "btrfs") {
$subvol = `mount | sed -n 's,^$fs->device on .*subvol=\([^,)]*\).*$,\1,p'` $subvol = `mount | sed -n 's,^@{[$fs->device]} on .*subvol=\([^,)]*\).*\$,\1,p'`
if ($subvol eq "") { if ($subvol eq "") {
$subvol = `btrfs subvol get-default $fs->mount | sed -n 's,^.*path \([^ ]*\) .*$,\1,p'` $subvol = `btrfs subvol get-default @{[$fs->mount]} | sed -n 's,^.*path \([^ ]*\) .*\$,\1,p'`
} }
$path = "/$subvol"; $path = "/$subvol";
} }