commit 0894e88e99ad09b302d318f45a6aacc71285565f · pyrox.dev/nixpkgs

+9 -3
nixos/modules/tasks/filesystems/bcachefs.nix
···

       111
       111
        
             deviceUnit = mkDeviceUnit device;

     

       112
       112
        
             mountUnit = mkMountUnit (prefix + fs.mountPoint);

     

       113
       113
        
             extractProperty =

     

       114
       114
       -
               prop: options: (map (lib.removePrefix "${prop}=") (builtins.filter (lib.hasPrefix prop) options));

     

       114
       114
       +
               prop: options: (map (lib.removePrefix prop) (builtins.filter (lib.hasPrefix prop) options));

     

       115
       115
        
             normalizeUnits =

     

       116
       116
        
               unit:

     

       117
       117
        
               if lib.hasPrefix "/dev/" unit then

     
···

       120
       120
        
                 mkMountUnit unit

     

       121
       121
        
               else

     

       122
       122
        
                 unit;

     

       123
       123
       -
             requiredUnits = map normalizeUnits (extractProperty "x-systemd.requires" fs.options);

     

       124
       124
       -
             wantedUnits = map normalizeUnits (extractProperty "x-systemd.wants" fs.options);

     

       123
       123
       +
             requiredUnits = map normalizeUnits (extractProperty "x-systemd.requires=" fs.options);

     

       124
       124
       +
             wantedUnits = map normalizeUnits (extractProperty "x-systemd.wants=" fs.options);

     

       125
       125
       +
             requiredMounts = extractProperty "x-systemd.requires-mounts-for=" fs.options;

     

       126
       126
       +
             wantedMounts = extractProperty "x-systemd.wants-mounts-for=" fs.options;

     

       125
       127
        
           in

     

       126
       128
        
           {

     

       127
       129
        
             name = "unlock-bcachefs-${utils.escapeSystemdPath fs.mountPoint}";

     
···

       136
       138
        
               bindsTo = [ deviceUnit ];

     

       137
       139
        
               requires = requiredUnits;

     

       138
       140
        
               wants = wantedUnits;

     

       141
       141
       +
               unitConfig = {

     

       142
       142
       +
                 RequiresMountsFor = requiredMounts;

     

       143
       143
       +
                 WantsMountsFor = wantedMounts;

     

       144
       144
       +
               };

     

       139
       145
        
               conflicts = [ "shutdown.target" ];

     

       140
       146
        
               unitConfig.DefaultDependencies = false;

     

       141
       147
        
               serviceConfig = {