diff options
| author | Emery Hemingway <emery@vfemail.net> | 2014-03-25 16:39:10 -0400 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-05-11 13:53:26 +0200 |
| commit | c96d5fe1702430df15a3313cd46f7de7c924718f (patch) | |
| tree | ace7a6d7956b22e9bf7f6aa8eca9984bd4c425a9 /nixos/modules | |
| parent | c0a30a4b510d05218c0a672b93b0724e99e40f51 (diff) | |
| download | nixlib-c96d5fe1702430df15a3313cd46f7de7c924718f.tar nixlib-c96d5fe1702430df15a3313cd46f7de7c924718f.tar.gz nixlib-c96d5fe1702430df15a3313cd46f7de7c924718f.tar.bz2 nixlib-c96d5fe1702430df15a3313cd46f7de7c924718f.tar.lz nixlib-c96d5fe1702430df15a3313cd46f7de7c924718f.tar.xz nixlib-c96d5fe1702430df15a3313cd46f7de7c924718f.tar.zst nixlib-c96d5fe1702430df15a3313cd46f7de7c924718f.zip | |
nixos: f2fs filesystem module support (close #2085)
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/profiles/base.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/system/boot/stage-1-init.sh | 2 | ||||
| -rw-r--r-- | nixos/modules/tasks/filesystems/f2fs.nix | 21 |
4 files changed, 25 insertions, 2 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f98b621111fd..5beaeb5388bb 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -306,6 +306,7 @@ ./tasks/filesystems.nix ./tasks/filesystems/btrfs.nix ./tasks/filesystems/ext.nix + ./tasks/filesystems/f2fs.nix ./tasks/filesystems/nfs.nix ./tasks/filesystems/reiserfs.nix ./tasks/filesystems/unionfs-fuse.nix diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 20b808c29e08..562419b3facb 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -34,6 +34,7 @@ pkgs.dosfstools pkgs.xfsprogs pkgs.jfsutils + pkgs.f2fs-tools #pkgs.jfsrec # disabled because of Boost dependency # Some compression/archiver tools. @@ -50,6 +51,6 @@ ]; # Include support for various filesystems. - boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" ]; + boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" ]; } diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 216937a619b1..c4a21b02cac3 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -204,7 +204,7 @@ checkFS() { # does (minutes versus seconds). if test -z "@checkJournalingFS@" -a \ \( "$fsType" = ext3 -o "$fsType" = ext4 -o "$fsType" = reiserfs \ - -o "$fsType" = xfs -o "$fsType" = jfs \) + -o "$fsType" = xfs -o "$fsType" = jfs -o "$fsType" = f2fs \) then return 0 fi diff --git a/nixos/modules/tasks/filesystems/f2fs.nix b/nixos/modules/tasks/filesystems/f2fs.nix new file mode 100644 index 000000000000..8655107360c1 --- /dev/null +++ b/nixos/modules/tasks/filesystems/f2fs.nix @@ -0,0 +1,21 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +let + inInitrd = any (fs: fs == "f2fs") config.boot.initrd.supportedFilesystems; +in +{ + config = mkIf (any (fs: fs == "f2fs") config.boot.supportedFilesystems) { + + system.fsPackages = [ pkgs.f2fs-tools ]; + + boot.initrd.availableKernelModules = mkIf inInitrd [ "f2fs" ]; + + boot.initrd.extraUtilsCommands = mkIf inInitrd '' + mkdir -p $out/bin $out/lib + cp -v ${pkgs.f2fs-tools}/sbin/fsck.f2fs $out/bin + cp -pdv ${pkgs.f2fs-tools}/lib/lib*.so.* $out/lib + ''; + }; +} |