Unverified Commit db180160 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

Drop more reiserfs (#461260)

parents 574ec536 2459f7a5

lib/systems/platforms.nix

+0 −3
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ rec { 
        BLK_DEV_DM m

        DM_CRYPT m

        MD y

        REISERFS_FS m

        BTRFS_FS m

        XFS_FS m

        JFS_FS m
@@ -430,7 +429,6 @@ rec { 
        BLK_DEV_DM m

        DM_CRYPT m

        MD y

        REISERFS_FS m

        EXT4_FS m

        USB_STORAGE_CYPRESS_ATACB m
@@ -475,7 +473,6 @@ rec { 
        FRAMEBUFFER_CONSOLE y

        EXT2_FS y

        EXT3_FS y

        REISERFS_FS y

        MAGIC_SYSRQ y



        # The kernel doesn't boot at all, with FTRACE

nixos/modules/module-list.nix

+0 −1
Original line number Diff line number Diff line
@@ -1929,7 +1929,6 @@ 
  ./tasks/filesystems/nfs.nix

  ./tasks/filesystems/ntfs.nix

  ./tasks/filesystems/overlayfs.nix

  ./tasks/filesystems/reiserfs.nix

  ./tasks/filesystems/squashfs.nix

  ./tasks/filesystems/sshfs.nix

  ./tasks/filesystems/unionfs-fuse.nix

nixos/modules/tasks/filesystems.nix

+0 −1
Original line number Diff line number Diff line
@@ -284,7 +284,6 @@ let 
      ++ lib.optionals (!config.boot.initrd.checkJournalingFS) [

        "ext3"

        "ext4"

        "reiserfs"

        "xfs"

        "jfs"

        "f2fs"

nixos/modules/tasks/filesystems/reiserfs.nix

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
{

  config,

  lib,

  pkgs,

  ...

}:



with lib;



let



  inInitrd = config.boot.initrd.supportedFilesystems.reiserfs or false;



in



{

  config = mkIf (config.boot.supportedFilesystems.reiserfs or false) {



    system.fsPackages = [ pkgs.reiserfsprogs ];



    boot.initrd.kernelModules = mkIf inInitrd [ "reiserfs" ];



    boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable) ''

      copy_bin_and_libs ${pkgs.reiserfsprogs}/sbin/reiserfsck

      ln -s reiserfsck $out/bin/fsck.reiserfs

    '';



    boot.initrd.systemd.initrdBin = mkIf inInitrd [ pkgs.reiserfsprogs ];



  };

}

pkgs/by-name/gp/gparted/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
  lvm2,

  nilfs-utils,

  ntfs3g,

  reiserfsprogs,

  udftools,

  xfsprogs,

  xfsdump,
@@ -97,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: { 
    lvm2

    nilfs-utils

    ntfs3g

    reiserfsprogs

    udftools

    xfsprogs

    xfsdump