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

nixos-install: Don't barf if btrfs is missing

Browse Source
This commit is contained in:
Eelco Dolstra 2015-07-13 17:55:49 +02:00
parent baad6a62c9
commit fd06533def
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/installer/tools/nixos-generate-config.pl
View File

@ -311,9 +311,9 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
# Maybe this is a bind-mount of a filesystem we saw earlier? # Maybe this is a bind-mount of a filesystem we saw earlier?
if (defined $fsByDev{$fields[2]}) { if (defined $fsByDev{$fields[2]}) {
# Make sure this isn't a btrfs subvolume # Make sure this isn't a btrfs subvolume.
my ($status, @msg) = runCommand("btrfs subvol show $rootDir$mountPoint"); my $msg = `btrfs subvol show $rootDir$mountPoint`;
if (join("", @msg) =~ /ERROR:/) { if ($? != 0 || $msg =~ /ERROR:/s) {
my $path = $fields[3]; $path = "" if $path eq "/"; my $path = $fields[3]; $path = "" if $path eq "/";
my $base = $fsByDev{$fields[2]}; my $base = $fsByDev{$fields[2]};
$base = "" if $base eq "/"; $base = "" if $base eq "/";