commit b9d8a730e36e688df855c40c39498b658b46955f · pyrox.dev/nixpkgs

+19 -1
nixos/modules/system/activation/activation-script.nix
···

       230
       230
        
       

     

       231
       231
        
           system.activationScripts.stdio = ""; # obsolete

     

       232
       232
        
           system.activationScripts.var = ""; # obsolete

     

       233
       233
       -
           system.activationScripts.specialfs = ""; # obsolete

     

       234
       233
        
       

     

       235
       234
        
           systemd.tmpfiles.rules = [

     

       236
       235
        
             # Prevent the current configuration from being garbage-collected.

     
···

       250
       249
        
             else ''

     

       251
       250
        
               rm -f /usr/bin/env

     

       252
       251
        
               rmdir --ignore-fail-on-non-empty /usr/bin /usr

     

       252
       252
       +
             '';

     

       253
       253
       +
       

     

       254
       254
       +
           system.activationScripts.specialfs =

     

       255
       255
       +
             ''

     

       256
       256
       +
               specialMount() {

     

       257
       257
       +
                 local device="$1"

     

       258
       258
       +
                 local mountPoint="$2"

     

       259
       259
       +
                 local options="$3"

     

       260
       260
       +
                 local fsType="$4"

     

       261
       261
       +
       

     

       262
       262
       +
                 if mountpoint -q "$mountPoint"; then

     

       263
       263
       +
                   local options="remount,$options"

     

       264
       264
       +
                 else

     

       265
       265
       +
                   mkdir -p "$mountPoint"

     

       266
       266
       +
                   chmod 0755 "$mountPoint"

     

       267
       267
       +
                 fi

     

       268
       268
       +
                 mount -t "$fsType" -o "$options" "$device" "$mountPoint"

     

       269
       269
       +
               }

     

       270
       270
       +
               source ${config.system.build.earlyMountScript}

     

       253
       271
        
             '';

     

       254
       272
        
       

     

       255
       273
        
           systemd.user = {