nixos/stage-1, nixos/f2fs: added F2FS resizing #42183

vikanezrimaya · 2018-06-18T22:27:30Z

Adding F2FS resize support like with ext* filesystems in stage1.

Motivation for this change

F2FS is used on Raspberry Pi-like devices to enhance SD card performance. Allowing F2FS resizing would help in automatic deploying of SD card images without a Linux box to resize the file system offline.

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

F2FS is used on Raspberry Pi-like devices to enhance SD card performance. Allowing F2FS resizing would help in automatic deploying of SD card images without a Linux box to resize the file system offline.

Mic92 · 2018-06-19T08:50:59Z

nixos/modules/system/boot/stage-1.nix

@@ -126,6 +126,10 @@ let
      ${optionalString (any (fs: fs.autoResize) fileSystems) ''
        # We need mke2fs in the initrd.
        copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/resize2fs
+        # Copy also f2fs-tools' fsck and resize
+        # TODO: separate these in case no f2fs fs are present


Can you add this check?

I thought about it, but I don't seem to understand how this conditional works: (any (fs: fs.autoResize) fileSystems)

If you can explain it or link me to documentation how this works, I'd be happy to implement separate conditions for ext* and f2fs resizing like this:

if anyfs.type("f2fs").hasparam(autoresize): # include f2fs-tools if anyfs.type("ext*").hasparam(autoresize): # include e2fsprogs

We have a similar check for zfs: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/tasks/filesystems/zfs.nix#L18

or better this one: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/tasks/filesystems/zfs.nix#L51

@Mic92 I pushed a separate check for f2fs. The only problem is - it includes mke2fs even if no ext* filesystems need resizing, because I wasn't sure how to wildcard ext2, ext3 and ext4 filesystems in the check.

…d of resizing

Mic92 · 2018-06-19T11:17:02Z

nixos/modules/system/boot/stage-1.nix

@@ -128,6 +128,13 @@ let
        copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/resize2fs
      ''}

+      # Copy f2fs-tools' fsck and resize if needed
+      ${optionalString (any (fs: fs.autoResize) (filter (x: x.fsType == "f2fs") fileSystems)) ''


I would say:

${optionalString (any (fs: fs.autoResize && fs.fsType = "f2f2") fileSystems)

Oops. Didn't consider the obvious fact that && stands for logical AND operation. One sec, will push the updated version!

If you are at it, please also move this code to: modules/tasks/filesystems/f2fs.nix
There we already have an f2fs check anyway...

@Mic92 moved to nixos/f2fs module.

nixos/modules/system/boot/stage-1.nix

…ools

…module

Mic92 · 2018-06-19T13:01:31Z

@GrahamcOfBorg test ec2-nixops

(also checks resizing)

GrahamcOfBorg · 2018-06-19T13:01:50Z

Success on aarch64-linux

Attempted: tests.ec2-nixops

No partial log is available.

vikanezrimaya · 2018-06-19T13:03:47Z

@Mic92 means I didn't broke anything? does it test f2fs? I didn't write any tests for this code.

Mic92 · 2018-06-19T13:05:33Z

Only ext4, which is also changed in this pull request. Since there is no log, I am not sure, if it is performed on aarch64 at all.

vikanezrimaya · 2018-06-19T13:06:57Z

Where do the resizing tests reside? Maybe it will be beneficial if I write the tests for it too. Who knows if it works or not, I don't have a NixOS box to test it...

GrahamcOfBorg · 2018-06-19T13:17:40Z

Failure on x86_64-linux (full log)

Attempted: tests.ec2-nixops

Partial log (click to expand)

machine: exit status 0
machine: must succeed: stat -c %S -f /
machine# [    7.784743] sshd[770]: pam_unix(sshd:session): session closed for user root
machine: exit status 0
error: wrong free space 2078097408 at (eval 16) line 53, <__ANONIO__> line 429.
wrong free space 2078097408 at (eval 16) line 53, <__ANONIO__> line 429.
cleaning up
killing machine (pid 596)
builder for '/nix/store/0cbgj0hfrhm4q13ar9cr02lp8jni4ffx-vm-test-run-ec2-nixops-userdata.drv' failed with exit code 255
error: build of '/nix/store/0cbgj0hfrhm4q13ar9cr02lp8jni4ffx-vm-test-run-ec2-nixops-userdata.drv' failed

fpletz

LGTM 👍

Is there any reason why this was not merged yet?

nixos/stage-1: added F2FS resizing

c24e917

F2FS is used on Raspberry Pi-like devices to enhance SD card performance. Allowing F2FS resizing would help in automatic deploying of SD card images without a Linux box to resize the file system offline.

GrahamcOfBorg added 6.topic: nixos 8.has: module (update) labels Jun 18, 2018

nixos/stage-1: added f2fs-tools' tools for resizing

b44d304

GrahamcOfBorg added 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Jun 18, 2018

nixos/stage-1: fixed if-else block

0b9b7be

Mic92 reviewed Jun 19, 2018

View reviewed changes

nixos/stage-1: implemented separate check for f2fs filesystems in nee…

5774837

…d of resizing

Mic92 reviewed Jun 19, 2018

View reviewed changes

nixos/modules/system/boot/stage-1.nix Show resolved Hide resolved

kisik21 added 3 commits June 19, 2018 14:23

nixos/stage-1: new separate conditionals for ext4 and f2fs resizing t…

34234dc

…ools

nixos/stage-1, nixos/f2fs: moved f2fs resizing tools include in f2fs …

4fa88fc

…module

nixos/f2fs: fixed autoresize check

62d21f2

vikanezrimaya changed the title ~~nixos/stage-1: added F2FS resizing~~ nixos/stage-1, nixos/f2fs: added F2FS resizing Jun 19, 2018

vikanezrimaya mentioned this pull request Jun 19, 2018

Use F2FS instead of ext4 in SD card images #42242

Open

fpletz approved these changes Jan 17, 2019

View reviewed changes

Mic92 merged commit a6b97bd into NixOS:master Jan 17, 2019

Janik-Haag added the 12. first-time contribution label Jun 12, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

nixos/stage-1, nixos/f2fs: added F2FS resizing #42183

nixos/stage-1, nixos/f2fs: added F2FS resizing #42183

vikanezrimaya commented Jun 18, 2018

Mic92 Jun 19, 2018

vikanezrimaya Jun 19, 2018

Mic92 Jun 19, 2018

Mic92 Jun 19, 2018

vikanezrimaya Jun 19, 2018

Mic92 Jun 19, 2018

vikanezrimaya Jun 19, 2018

Mic92 Jun 19, 2018 •

edited

vikanezrimaya Jun 19, 2018

Mic92 commented Jun 19, 2018

GrahamcOfBorg commented Jun 19, 2018

vikanezrimaya commented Jun 19, 2018

Mic92 commented Jun 19, 2018 •

edited

vikanezrimaya commented Jun 19, 2018

GrahamcOfBorg commented Jun 19, 2018

fpletz left a comment

nixos/stage-1, nixos/f2fs: added F2FS resizing #42183

nixos/stage-1, nixos/f2fs: added F2FS resizing #42183

Conversation

vikanezrimaya commented Jun 18, 2018

Motivation for this change

Things done

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mic92 Jun 19, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mic92 commented Jun 19, 2018

GrahamcOfBorg commented Jun 19, 2018

vikanezrimaya commented Jun 19, 2018

Mic92 commented Jun 19, 2018 • edited

vikanezrimaya commented Jun 19, 2018

GrahamcOfBorg commented Jun 19, 2018

fpletz left a comment

Choose a reason for hiding this comment

Mic92 Jun 19, 2018 •

edited

Mic92 commented Jun 19, 2018 •

edited