diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2014-08-31 12:58:37 +0400 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2014-08-31 12:58:37 +0400 |
commit | 94205f5f21c4d9942bb4205c06229438051b6853 (patch) | |
tree | e23520f5a9c566e074426454a844d20087437098 /nixos/modules/installer/tools/nixos-generate-config.pl | |
parent | 347dd52019d57ae15c25d56a36aa881c0badc05f (diff) | |
download | nixpkgs-94205f5f21c4d9942bb4205c06229438051b6853.tar nixpkgs-94205f5f21c4d9942bb4205c06229438051b6853.tar.gz nixpkgs-94205f5f21c4d9942bb4205c06229438051b6853.tar.bz2 nixpkgs-94205f5f21c4d9942bb4205c06229438051b6853.tar.lz nixpkgs-94205f5f21c4d9942bb4205c06229438051b6853.tar.xz nixpkgs-94205f5f21c4d9942bb4205c06229438051b6853.tar.zst nixpkgs-94205f5f21c4d9942bb4205c06229438051b6853.zip |
Revert "Merge pull request #2449 from wkennington/master.grub"
This reverts commit 469f22d717e53c48d13a66ca862942e8098accc5, reversing changes made to 0078bc5d8f87512104902eab00c8a44bef286067. Conflicts: nixos/modules/installer/tools/nixos-generate-config.pl nixos/modules/system/boot/loader/grub/install-grub.pl nixos/release.nix nixos/tests/installer.nix I tried to keep apparently-safe code in conflicts.
Diffstat (limited to 'nixos/modules/installer/tools/nixos-generate-config.pl')
-rw-r--r-- | nixos/modules/installer/tools/nixos-generate-config.pl | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 73dd87cef5c..66a8152a3a6 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -20,13 +20,6 @@ sub uniq { return @res; } -sub runCommand { - my ($cmd) = @_; - open FILE, "$cmd 2>/dev/null |" or die "Failed to execute: $cmd\n"; - my @ret = <FILE>; - close FILE; - return ($?, @ret); -} # Process the command line. my $outDir = "/etc/nixos"; @@ -344,20 +337,6 @@ 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]"; - } - } - # Emit the filesystem. $fileSystems .= <<EOF; fileSystems.\"$mountPoint\" = |