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

Making nixos fileSystems aware of fsType "reiserfs" and "btrfs", regarding

Browse Source 
modules, tools, intrd pieces, ...

That's only useful if the user specifies fsType, though.


svn path=/nixos/trunk/; revision=32912
This commit is contained in:
Lluís Batlle i Rossell 2012-03-08 21:07:25 +00:00
parent 98dde13782
commit 9d1b72a6c7
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
modules/tasks/filesystems.nix
View File

@ -3,12 +3,33 @@
with pkgs.lib; with pkgs.lib;
let let
needsBtrfsProgs = any (fs: fs.fsType == "btrfs") config.fileSystems; usingSome = fsname: any (fs: fs.fsType == fsname) config.fileSystems;
usingSomeStage1 = fsname: any (fs: fs.fsType == fsname &&
(fs.mountPoint == "/" || fs.neededForBoot)) config.fileSystems;
usingBtrfs = usingSome "btrfs";
usingBtrfsStage1 = usingSomeStage1 "btrfs";
usingReiserfs = usingSome "reiserfs";
usingReiserfsStage1 = usingSomeStage1 "reiserfs";
# Packages that provide fsck backends. # Packages that provide fsck backends.
fsPackages = [ pkgs.e2fsprogs pkgs.reiserfsprogs pkgs.dosfstools ] fsPackages = [ pkgs.e2fsprogs pkgs.dosfstools ]
++ optional needsBtrfsProgs pkgs.btrfsProgs; ++ optional usingReiserfs pkgs.btrfsProgs
++ optional usingBtrfs pkgs.btrfsProgs;
fsKernelModules = optional usingBtrfsStage1 [ "btrfs" "crc32c" ]
++ optional usingReiserfsStage1 [ "reiserfs" ];
fsExtraUtilsCommands = optionalString usingBtrfsStage1 ''
cp -v ${pkgs.btrfsProgs}/bin/btrfsck $out/bin
cp -v ${pkgs.btrfsProgs}/bin/btrfs $out/bin
ln -sv btrfsck $out/bin/fsck.btrfs
'';
fsPostDeviceCommands = optionalString usingBtrfsStage1 ''
btrfs device scan
'';
in in
@ -162,6 +183,10 @@ in
target = "fstab"; target = "fstab";
}; };
boot.initrd.extraUtilsCommands = fsExtraUtilsCommands;
boot.initrd.postDeviceCommands = fsPostDeviceCommands;
boot.initrd.kernelModules = fsKernelModules;
jobs.mountall = jobs.mountall =
{ startOn = "started udev" { startOn = "started udev"
# !!! The `started nfs-kernel-statd' condition shouldn't be # !!! The `started nfs-kernel-statd' condition shouldn't be
@ -178,7 +203,7 @@ in
exec > /dev/console 2>&1 exec > /dev/console 2>&1
echo "mounting filesystems..." echo "mounting filesystems..."
export PATH=${config.system.sbin.mount}/bin:${makeSearchPath "sbin" ([pkgs.utillinux] ++ fsPackages)}:$PATH export PATH=${config.system.sbin.mount}/bin:${makeSearchPath "sbin" ([pkgs.utillinux] ++ fsPackages)}:$PATH
${optionalString needsBtrfsProgs "${pkgs.btrfsProgs}/bin/btrfs device scan"} ${optionalString usingBtrfs "${pkgs.btrfsProgs}/bin/btrfs device scan"}
${pkgs.mountall}/sbin/mountall ${pkgs.mountall}/sbin/mountall
''; '';
}; };