Unverified Commit 4627ee74 authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

Merge pull request #234877 from ElvishJerricco/auto-format-and-resize-with-systemd 

Auto format and resize with systemd
parents 5344f093 b4975023

nixos/doc/manual/release-notes/rl-2311.section.md

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ 


- `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities.



- `fileSystems.<name>.autoFormat` now uses `systemd-makefs`, which does not accept formatting options. Therefore, `fileSystems.<name>.formatOptions` has been removed.



- `fileSystems.<name>.autoResize` now uses `systemd-growfs` to resize the file system online in stage 2. This means that `f2fs` and `ext2` can no longer be auto resized, while `xfs` and `btrfs` now can be.



## Other Notable Changes {#sec-release-23.11-notable-changes}



- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.

nixos/modules/system/boot/stage-1-init.sh

+0 −16
Original line number Diff line number Diff line
@@ -374,22 +374,6 @@ mountFS() { 


    checkFS "$device" "$fsType"



    # Optionally resize the filesystem.

    case $options in

        *x-nixos.autoresize*)

            if [ "$fsType" = ext2 -o "$fsType" = ext3 -o "$fsType" = ext4 ]; then

                modprobe "$fsType"

                echo "resizing $device..."

                e2fsck -fp "$device"

                resize2fs "$device"

            elif [ "$fsType" = f2fs ]; then

                echo "resizing $device..."

                fsck.f2fs -fp "$device"

                resize.f2fs "$device"

            fi

            ;;

    esac



    # Create backing directories for overlayfs

    if [ "$fsType" = overlay ]; then

        for i in upper work; do

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

+0 −6
Original line number Diff line number Diff line
@@ -150,12 +150,6 @@ let 
      copy_bin_and_libs ${pkgs.kmod}/bin/kmod

      ln -sf kmod $out/bin/modprobe



      # Copy resize2fs if any ext* filesystems are to be resized

      ${optionalString (any (fs: fs.autoResize && (lib.hasPrefix "ext" fs.fsType)) fileSystems) ''

        # We need mke2fs in the initrd.

        copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/resize2fs

      ''}



      # Copy multipath.

      ${optionalString config.services.multipath.enable ''

        copy_bin_and_libs ${config.services.multipath.package}/bin/multipath

nixos/modules/system/boot/systemd.nix

+9 −0
Original line number Diff line number Diff line
@@ -588,6 +588,15 @@ in 
    systemd.services."systemd-backlight@".restartIfChanged = false;

    systemd.services."systemd-fsck@".restartIfChanged = false;

    systemd.services."systemd-fsck@".path = [ config.system.path ];

    systemd.services."systemd-makefs@" = {

      restartIfChanged = false;

      path = [ pkgs.util-linux ] ++ config.system.fsPackages;

      # Since there is no /etc/systemd/system/systemd-makefs@.service

      # file, the units generated in /run/systemd/generator would

      # override anything we put here. But by forcing the use of a

      # drop-in in /etc, it does apply.

      overrideStrategy = "asDropin";

    };

    systemd.services.systemd-random-seed.restartIfChanged = false;

    systemd.services.systemd-remount-fs.restartIfChanged = false;

    systemd.services.systemd-update-utmp.restartIfChanged = false;

nixos/modules/system/boot/systemd/initrd.nix

+0 −3
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ let 
    "systemd-ask-password-console.path"

    "systemd-ask-password-console.service"

    "systemd-fsck@.service"

    "systemd-growfs@.service"

    "systemd-halt.service"

    "systemd-hibernate-resume@.service"

    "systemd-journald-audit.socket"
@@ -93,7 +92,6 @@ let 
  fileSystems = filter utils.fsNeededForBoot config.system.build.fileSystems;



  needMakefs = lib.any (fs: fs.autoFormat) fileSystems;

  needGrowfs = lib.any (fs: fs.autoResize) fileSystems;



  kernel-name = config.boot.kernelPackages.kernel.name or "kernel";

  modulesTree = config.system.modulesTree.override { name = kernel-name + "-modules"; };
@@ -400,7 +398,6 @@ in { 
      storePaths = [

        # systemd tooling

        "${cfg.package}/lib/systemd/systemd-fsck"

        (lib.mkIf needGrowfs "${cfg.package}/lib/systemd/systemd-growfs")

        "${cfg.package}/lib/systemd/systemd-hibernate-resume"

        "${cfg.package}/lib/systemd/systemd-journald"

        (lib.mkIf needMakefs "${cfg.package}/lib/systemd/systemd-makefs")