commit 14b77582da466c5d064db11ce7dbe67b8506362b · pyrox.dev/nixpkgs

+1

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

···

       365
       365
        
               less = "${pkgs.less}/bin/less";

     

       366
       366
        
               mount = "${cfg.package.util-linux}/bin/mount";

     

       367
       367
        
               umount = "${cfg.package.util-linux}/bin/umount";

     

       368
       368
       +
               fsck = "${cfg.package.util-linux}/bin/fsck";

     

       368
       369
        
             };

     

       369
       370
        
       

     

       370
       371
        
             managerEnvironment.PATH = "/bin:/sbin";

+32 -5

nixos/modules/tasks/filesystems.nix

···

       158
       158
        
       

     

       159
       159
        
         makeFstabEntries =

     

       160
       160
        
           let

     

       161
       161
       -
             fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "nfs4" "vboxsf" "glusterfs" "apfs" "9p" "cifs" "prl_fs" "vmhgfs" ];

     

       161
       161
       +
             fsToSkipCheck = [

     

       162
       162
       +
               "none"

     

       163
       163
       +
               "auto"

     

       164
       164
       +
               "overlay"

     

       165
       165
       +
               "iso9660"

     

       166
       166
       +
               "bindfs"

     

       167
       167
       +
               "udf"

     

       168
       168
       +
               "btrfs"

     

       169
       169
       +
               "zfs"

     

       170
       170
       +
               "tmpfs"

     

       171
       171
       +
               "bcachefs"

     

       172
       172
       +
               "nfs"

     

       173
       173
       +
               "nfs4"

     

       174
       174
       +
               "nilfs2"

     

       175
       175
       +
               "vboxsf"

     

       176
       176
       +
               "squashfs"

     

       177
       177
       +
               "glusterfs"

     

       178
       178
       +
               "apfs"

     

       179
       179
       +
               "9p"

     

       180
       180
       +
               "cifs"

     

       181
       181
       +
               "prl_fs"

     

       182
       182
       +
               "vmhgfs"

     

       183
       183
       +
             ] ++ lib.optionals (!config.boot.initrd.checkJournalingFS) [

     

       184
       184
       +
               "ext3"

     

       185
       185
       +
               "ext4"

     

       186
       186
       +
               "reiserfs"

     

       187
       187
       +
               "xfs"

     

       188
       188
       +
               "jfs"

     

       189
       189
       +
               "f2fs"

     

       190
       190
       +
             ];

     

       162
       191
        
             isBindMount = fs: builtins.elem "bind" fs.options;

     

       163
       192
        
             skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck || isBindMount fs;

     

       164
       193
        
             # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces

     

       165
       194
        
             escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string;

     

       166
       166
       -
           in fstabFileSystems: { rootPrefix ? "", excludeChecks ? false, extraOpts ? (fs: []) }: concatMapStrings (fs:

     

       195
       195
       +
           in fstabFileSystems: { rootPrefix ? "", extraOpts ? (fs: []) }: concatMapStrings (fs:

     

       167
       196
        
             (optionalString (isBindMount fs) (escape rootPrefix))

     

       168
       197
        
             + (if fs.device != null then escape fs.device

     

       169
       198
        
                else if fs.label != null then "/dev/disk/by-label/${escape fs.label}"

     
···

       171
       200
        
             + " " + escape fs.mountPoint

     

       172
       201
        
             + " " + fs.fsType

     

       173
       202
        
             + " " + escape (builtins.concatStringsSep "," (fs.options ++ (extraOpts fs)))

     

       174
       174
       -
             + " " + (optionalString (!excludeChecks)

     

       175
       175
       -
               ("0 " + (if skipCheck fs then "0" else if fs.mountPoint == "/" then "1" else "2")))

     

       203
       203
       +
             + " 0 " + (if skipCheck fs then "0" else if fs.mountPoint == "/" then "1" else "2")

     

       176
       204
        
             + "\n"

     

       177
       205
        
           ) fstabFileSystems;

     

       178
       206
        
       

     

       179
       207
        
           initrdFstab = pkgs.writeText "initrd-fstab" (makeFstabEntries (filter utils.fsNeededForBoot fileSystems) {

     

       180
       208
        
             rootPrefix = "/sysroot";

     

       181
       181
       -
             excludeChecks = true;

     

       182
       209
        
             extraOpts = fs:

     

       183
       210
        
               (optional fs.autoResize "x-systemd.growfs")

     

       184
       211
        
               ++ (optional fs.autoFormat "x-systemd.makefs");

+1

nixos/tests/all-tests.nix

···

       233
       233
        
         freshrss-pgsql = handleTest ./freshrss-pgsql.nix {};

     

       234
       234
        
         frr = handleTest ./frr.nix {};

     

       235
       235
        
         fsck = handleTest ./fsck.nix {};

     

       236
       236
       +
         fsck-systemd-stage-1 = handleTest ./fsck.nix { systemdStage1 = true; };

     

       236
       237
        
         ft2-clone = handleTest ./ft2-clone.nix {};

     

       237
       238
        
         mimir = handleTest ./mimir.nix {};

     

       238
       239
        
         garage = handleTest ./garage {};

+11 -1

nixos/tests/fsck.nix

···

       1
       1
       +
       { system ? builtins.currentSystem

     

       2
       2
       +
       , config ? {}

     

       3
       3
       +
       , pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       , systemdStage1 ? false

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       1
       7
        
       import ./make-test-python.nix {

     

       2
       8
        
         name = "fsck";

     

       3
       9
        
       

     
···

       11
       17
        
               autoFormat = true;

     

       12
       18
        
             };

     

       13
       19
        
           };

     

       20
       20
       +
       

     

       21
       21
       +
           boot.initrd.systemd.enable = systemdStage1;

     

       14
       22
        
         };

     

       15
       23
        
       

     

       16
       24
        
         testScript = ''

     

       17
       25
        
           machine.wait_for_unit("default.target")

     

       18
       26
        
       

     

       19
       27
        
           with subtest("root fs is fsckd"):

     

       20
       20
       -
               machine.succeed("journalctl -b | grep 'fsck.ext4.*/dev/vda'")

     

       28
       28
       +
               machine.succeed("journalctl -b | grep '${if systemdStage1

     

       29
       29
       +
                 then "fsck.*vda.*clean"

     

       30
       30
       +
                 else "fsck.ext4.*/dev/vda"}'")

     

       21
       31
        
       

     

       22
       32
        
           with subtest("mnt fs is fsckd"):

     

       23
       33
        
               machine.succeed("journalctl -b | grep 'fsck.*/dev/vdb.*clean'")

+16 -5

pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch

···

       4
       4
        
       Subject: [PATCH] Look for fsck in the right place

     

       5
       5
        
       

     

       6
       6
        
       ---

     

       7
       7
       -
        src/fsck/fsck.c | 2 +-

     

       8
       8
       -
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       7
       7
       +
        src/fsck/fsck.c | 6 +++++-

     

       8
       8
       +
        1 file changed, 5 insertions(+), 1 deletion(-)

     

       9
       9
        
       

     

       10
       10
        
       diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c

     

       11
       11
       -
       index 595434ab57..374a4e6c76 100644

     

       11
       11
       +
       index 73c76fceea..d00cea7158 100644

     

       12
       12
        
       --- a/src/fsck/fsck.c

     

       13
       13
        
       +++ b/src/fsck/fsck.c

     

       14
       14
       -
       @@ -373,7 +373,7 @@ static int run(int argc, char *argv[]) {

     

       14
       14
       +
       @@ -352,6 +352,7 @@ static int run(int argc, char *argv[]) {

     

       15
       15
       +
                if (r == 0) {

     

       16
       16
       +
                        char dash_c[STRLEN("-C") + DECIMAL_STR_MAX(int) + 1];

     

       17
       17
       +
                        int progress_socket = -1;

     

       18
       18
       +
       +                _cleanup_free_ char *fsck_name = NULL;

     

       19
       19
       +
                        const char *cmdline[9];

     

       20
       20
       +
                        int i = 0;

     

       21
       21
       +
        

     

       22
       22
       +
       @@ -372,7 +373,10 @@ static int run(int argc, char *argv[]) {

     

       15
       23
        
                        } else

     

       16
       24
        
                                dash_c[0] = 0;

     

       17
       25
        
        

     

       18
       26
        
       -                cmdline[i++] = "/sbin/fsck";

     

       19
       19
       -
       +                cmdline[i++] = "/run/current-system/sw/bin/fsck";

     

       27
       27
       +
       +                r = find_executable("fsck", &fsck_name);

     

       28
       28
       +
       +                if (r < 0)

     

       29
       29
       +
       +                        return r;

     

       30
       30
       +
       +                cmdline[i++] = fsck_name;

     

       20
       31
        
                        cmdline[i++] =  arg_repair;

     

       21
       32
        
                        cmdline[i++] = "-T";

     

       22
       33