Author: viric
Date: Tue Mar 20 22:00:32 2012
New Revision: 33311
URL: https://nixos.org/websvn/nix/?rev=33311&sc=1
Log:
Adding xfs support at supportedFilesystems
Added:
nixos/trunk/modules/tasks/filesystems/xfs.nix
Modified:
nixos/trunk/modules/module-list.nix
Modified: nixos/trunk/modules/module-list.nix
==============================================================================
--- nixos/trunk/modules/module-list.nix Tue Mar 20 21:45:24 2012 (r33310)
+++ nixos/trunk/modules/module-list.nix Tue Mar 20 22:00:32 2012 (r33311)
@@ -208,6 +208,7 @@
./tasks/filesystems/nfs.nix
./tasks/filesystems/reiserfs.nix
./tasks/filesystems/vfat.nix
+ ./tasks/filesystems/xfs.nix
./tasks/kbd.nix
./tasks/lvm.nix
./tasks/network-interfaces.nix
Added: nixos/trunk/modules/tasks/filesystems/xfs.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixos/trunk/modules/tasks/filesystems/xfs.nix Tue Mar 20 22:00:32
2012 (r33311)
@@ -0,0 +1,29 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+ inInitrd = any (fs: fs == "xfs") config.boot.initrd.supportedFilesystems;
+
+in
+
+{
+ config = mkIf (any (fs: fs == "xfs") config.boot.supportedFilesystems) {
+
+ system.fsPackages = [ pkgs.xfsprogs ];
+
+ boot.initrd.kernelModules = mkIf inInitrd [ "xfs" ];
+
+ boot.initrd.extraUtilsCommands = mkIf inInitrd
+ ''
+ cp -v ${pkgs.xfsprogs}/sbin/fsck.xfs $out/bin
+ '';
+
+ # Trick just to set 'sh' after the extraUtils nuke-refs.
+ boot.initrd.extraUtilsCommandsTest = mkIf inInitrd
+ ''
+ sed -i -e 's,^#!.*,#!'$out/bin/sh, $out/bin/fsck.xfs
+ '';
+ };
+}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
