* Modularise vfat support. Also add fsck.vfat to the initrd. This

  prevents errors when booting from VFAT (e.g. an ISO image converted
  using unetbootin).

svn path=/nixos/trunk/; revision=32956

1 files changed, 25 insertions, 0 deletions

diff --git a/modules/tasks/filesystems/vfat.nix b/modules/tasks/filesystems/vfat.nix
new file mode 100644
index 00000000000..5ca72f142b7
--- /dev/null
+++ b/modules/tasks/filesystems/vfat.nix
@@ -0,0 +1,25 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  inInitrd = any (fs: fs == "vfat") config.boot.initrd.supportedFilesystems;
+
+in
+
+{
+  config = mkIf (any (fs: fs == "vfat") config.boot.supportedFilesystems) {
+
+    system.fsPackages = [ pkgs.dosfstools ];
+
+    boot.initrd.kernelModules = mkIf inInitrd [ "vfat" "nls_cp437" "nls_iso8859-1" ];
+
+    boot.initrd.extraUtilsCommands = mkIf inInitrd
+      ''
+        cp -v ${pkgs.dosfstools}/sbin/dosfsck $out/bin
+        ln -sv dosfsck $out/bin/fsck.vfat
+      '';
+
+  };
+}