commit 63d259df32ab969c46aa839a77e8d86cb8f734cf · pyrox.dev/nixpkgs

+2

nixos/modules/module-list.nix

···

       297
       297
        
         ./services/x11/xserver.nix

     

       298
       298
        
         ./system/activation/activation-script.nix

     

       299
       299
        
         ./system/activation/top-level.nix

     

       300
       300
       +
         ./system/boot/emergency-mode.nix

     

       300
       301
        
         ./system/boot/kernel.nix

     

       301
       302
        
         ./system/boot/kexec.nix

     

       302
       303
        
         ./system/boot/loader/efi.nix

     
···

       312
       313
        
         ./system/boot/stage-1.nix

     

       313
       314
        
         ./system/boot/stage-2.nix

     

       314
       315
        
         ./system/boot/systemd.nix

     

       316
       316
       +
         ./system/boot/tmp.nix

     

       315
       317
        
         ./system/etc/etc.nix

     

       316
       318
        
         ./system/upstart/upstart.nix

     

       317
       319
        
         ./tasks/cpu-freq.nix

+37

nixos/modules/system/boot/emergency-mode.nix

···

       1
       1
       +
       { config, lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       {

     

       6
       6
       +
       

     

       7
       7
       +
         ###### interface

     

       8
       8
       +
       

     

       9
       9
       +
         options = {

     

       10
       10
       +
       

     

       11
       11
       +
           systemd.enableEmergencyMode = mkOption {

     

       12
       12
       +
             default = true;

     

       13
       13
       +
             type = types.bool;

     

       14
       14
       +
             description = ''

     

       15
       15
       +
               Whether to enable emergency mode, which is an

     

       16
       16
       +
               <command>sulogin</command> shell started on the console if

     

       17
       17
       +
               mounting a filesystem fails.  Since some machines (like EC2

     

       18
       18
       +
               instances) have no console of any kind, emergency mode doesn't

     

       19
       19
       +
               make sense, and it's better to continue with the boot insofar

     

       20
       20
       +
               as possible.

     

       21
       21
       +
             '';

     

       22
       22
       +
           };

     

       23
       23
       +
       

     

       24
       24
       +
         };

     

       25
       25
       +
       

     

       26
       26
       +
         ###### implementation

     

       27
       27
       +
       

     

       28
       28
       +
         config = {

     

       29
       29
       +
       

     

       30
       30
       +
           systemd.additionalUpstreamSystemUnits = optionals

     

       31
       31
       +
             config.systemd.enableEmergencyMode [

     

       32
       32
       +
               "emergency.target" "emergency.service"

     

       33
       33
       +
             ];

     

       34
       34
       +
       

     

       35
       35
       +
         };

     

       36
       36
       +
       

     

       37
       37
       +
       }

-6

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

···

       98
       98
        
       rm -rf /var/run /var/lock

     

       99
       99
        
       rm -f /etc/{group,passwd,shadow}.lock

     

       100
       100
        
       

     

       101
       101
       -
       if test -n "@cleanTmpDir@"; then

     

       102
       102
       -
           echo -n "cleaning \`/tmp'..."

     

       103
       103
       -
           find /tmp -maxdepth 1 -mindepth 1 -print0 | xargs -0r rm -rf --one-file-system

     

       104
       104
       -
           echo " done"

     

       105
       105
       -
       fi

     

       106
       106
       -
       

     

       107
       101
        
       

     

       108
       102
        
       # Also get rid of temporary GC roots.

     

       109
       103
        
       rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots

+2 -12

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

···

       17
       17
        
           src = ./stage-2-init.sh;

     

       18
       18
        
           shellDebug = "${pkgs.bashInteractive}/bin/bash";

     

       19
       19
        
           isExecutable = true;

     

       20
       20
       -
           inherit (config.boot) devShmSize runSize cleanTmpDir;

     

       20
       20
       +
           inherit (config.boot) devShmSize runSize;

     

       21
       21
        
           inherit (config.nix) readOnlyStore;

     

       22
       22
        
           inherit (config.networking) useHostResolvConf;

     

       23
       23
        
           ttyGid = config.ids.gids.tty;

     
···

       26
       26
        
               pkgs.utillinux

     

       27
       27
        
               pkgs.sysvtools

     

       28
       28
        
               pkgs.openresolv

     

       29
       29
       -
             ] ++ (optional config.boot.cleanTmpDir pkgs.findutils)

     

       30
       30
       -
             ++ optional config.nix.readOnlyStore readonlyMountpoint;

     

       29
       29
       +
             ] ++ optional config.nix.readOnlyStore readonlyMountpoint;

     

       31
       30
        
           postBootCommands = pkgs.writeText "local-cmds"

     

       32
       31
        
             ''

     

       33
       32
        
               ${config.boot.postBootCommands}

     
···

       78
       77
        
               description = ''

     

       79
       78
        
                 Size limit for the /run tmpfs. Look at mount(8), tmpfs size option,

     

       80
       79
        
                 for the accepted syntax.

     

       81
       81
       -
               '';

     

       82
       82
       -
             };

     

       83
       83
       -
       

     

       84
       84
       -
             # FIXME: should replace this with something that uses systemd-tmpfiles.

     

       85
       85
       -
             cleanTmpDir = mkOption {

     

       86
       86
       -
               type = types.bool;

     

       87
       87
       -
               default = false;

     

       88
       88
       -
               description = ''

     

       89
       89
       -
                 Whether to delete all files in <filename>/tmp</filename> during boot.

     

       90
       80
        
               '';

     

       91
       81
        
             };

     

       92
       82

+10 -17

nixos/modules/system/boot/systemd.nix

···

       162
       162
        
             "systemd-sysctl.service"

     

       163
       163
        
           ]

     

       164
       164
        
       

     

       165
       165
       -
           ++ optionals cfg.enableEmergencyMode [

     

       166
       166
       -
             "emergency.target"

     

       167
       167
       -
             "emergency.service"

     

       168
       168
       -
           ];

     

       165
       165
       +
           ++ cfg.additionalUpstreamSystemUnits;

     

       169
       166
        
       

     

       170
       167
        
         upstreamSystemWants =

     

       171
       168
        
           [ #"basic.target.wants"

     
···

       637
       634
        
             '';

     

       638
       635
        
           };

     

       639
       636
        
       

     

       640
       640
       -
           systemd.enableEmergencyMode = mkOption {

     

       641
       641
       -
             default = true;

     

       642
       642
       -
             type = types.bool;

     

       643
       643
       -
             description = ''

     

       644
       644
       -
               Whether to enable emergency mode, which is an

     

       645
       645
       -
               <command>sulogin</command> shell started on the console if

     

       646
       646
       -
               mounting a filesystem fails.  Since some machines (like EC2

     

       647
       647
       -
               instances) have no console of any kind, emergency mode doesn't

     

       648
       648
       -
               make sense, and it's better to continue with the boot insofar

     

       649
       649
       -
               as possible.

     

       650
       650
       -
             '';

     

       651
       651
       -
           };

     

       652
       652
       -
       

     

       653
       637
        
           systemd.tmpfiles.rules = mkOption {

     

       654
       638
        
             type = types.listOf types.str;

     

       655
       639
        
             default = [];

     
···

       690
       674
        
             type = types.attrsOf types.optionSet;

     

       691
       675
        
             options = [ socketOptions unitConfig ];

     

       692
       676
        
             description = "Definition of systemd per-user socket units.";

     

       677
       677
       +
           };

     

       678
       678
       +
       

     

       679
       679
       +
           systemd.additionalUpstreamSystemUnits = mkOption {

     

       680
       680
       +
             default = [ ];

     

       681
       681
       +
             type = types.listOf types.str;

     

       682
       682
       +
             example = [ "debug-shell.service" "systemd-quotacheck.service" ];

     

       683
       683
       +
             description = ''

     

       684
       684
       +
               Additional units shipped with systemd that shall be enabled.

     

       685
       685
       +
             '';

     

       693
       686
        
           };

     

       694
       687
        
       

     

       695
       688
        
         };

+39

nixos/modules/system/boot/tmp.nix

···

       1
       1
       +
       { config, lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       {

     

       6
       6
       +
       

     

       7
       7
       +
         ###### interface

     

       8
       8
       +
       

     

       9
       9
       +
         options = {

     

       10
       10
       +
       

     

       11
       11
       +
           boot.cleanTmpDir = mkOption {

     

       12
       12
       +
             type = types.bool;

     

       13
       13
       +
             default = false;

     

       14
       14
       +
             description = ''

     

       15
       15
       +
               Whether to delete all files in <filename>/tmp</filename> during boot.

     

       16
       16
       +
             '';

     

       17
       17
       +
           };

     

       18
       18
       +
       

     

       19
       19
       +
           boot.tmpOnTmpfs = mkOption {

     

       20
       20
       +
             type = types.bool;

     

       21
       21
       +
             default = false;

     

       22
       22
       +
             description = ''

     

       23
       23
       +
                Whether to mount a tmpfs on <filename>/tmp</filename> during boot.

     

       24
       24
       +
             '';

     

       25
       25
       +
           };

     

       26
       26
       +
       

     

       27
       27
       +
         };

     

       28
       28
       +
       

     

       29
       29
       +
         ###### implementation

     

       30
       30
       +
       

     

       31
       31
       +
         config = {

     

       32
       32
       +
       

     

       33
       33
       +
           systemd.additionalUpstreamSystemUnits = optional config.boot.tmpOnTmpfs "tmp.mount";

     

       34
       34
       +
       

     

       35
       35
       +
           systemd.tmpfiles.rules = optional config.boot.cleanTmpDir "D! /tmp 1777 root root";

     

       36
       36
       +
       

     

       37
       37
       +
         };

     

       38
       38
       +
       

     

       39
       39
       +
       }