Fix for when btrfs device was used as boot device, the variable neces…

…sary for the grub script would not be set.
faiproject · Sep 15, 2016 · 57760d4 · 57760d4
1 parent 9624061
commit 57760d4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/setup-storage/Fstab.pm b/lib/setup-storage/Fstab.pm
@@ -171,7 +171,7 @@ sub find_boot_mnt_point {
       }
     } elsif ($c eq "BTRFS") {
       foreach my $b (keys %{ $config{$c}->{volumes}}) {
-        my $this_mp = $config{$c}->{volumes}->{mountpoint};
+        my $this_mp = $config{$c}->{volumes}->{$b}->{mountpoint};
         next if (!defined($this_mp));
         return $this_mp if ($this_mp eq "/boot");
         $mnt_point = $this_mp if ($this_mp eq "/");
@@ -304,6 +304,9 @@ sub generate_fstab {
         # skip entries without a mountpoint
         next if ( $config->{$c}->{volumes}->{$v}->{mountpoint} eq "-");
 
+        $FAI::disk_var{BOOT_DEVICE} = (keys $config->{$c}->{volumes}->{$v}->{devices})[0]
+          if ( $config->{$c}->{volumes}->{$v}->{mountpoint} eq $boot_mnt_point);
+
         # get an array of devices that are part of the BTRFS RAID configuration
         my @device_names = keys %{ $config->{$c}->{volumes}->{$v}->{devices}};
         my $name_string = join(".", @device_names);