commit 474d5a7bd00e4d3cf3e15e4f0c80a5f46b96cbde · pyrox.dev/nixpkgs

+24

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

···

       155
       155
        
       mount -t tmpfs -o "mode=0755" tmpfs /var/setuid-wrappers

     

       156
       156
        
       

     

       157
       157
        
       

     

       158
       158
       +
       # Optionally log the script output to /dev/kmsg or /run/log/stage-2-init.log.

     

       159
       159
       +
       # Only at this point are all the necessary prerequisites ready for these commands.

     

       160
       160
       +
       if test -n "@logCommands@"; then

     

       161
       161
       +
           exec {logOutFd}>&1 {logErrFd}>&2

     

       162
       162
       +
           if test -w /dev/kmsg; then

     

       163
       163
       +
               exec > >(tee -i /proc/self/fd/"$logOutFd" | while read line; do

     

       164
       164
       +
                   if test -n "$line"; then

     

       165
       165
       +
                       echo "stage-2-init: $line" > /dev/kmsg

     

       166
       166
       +
                   fi

     

       167
       167
       +
               done) 2>&1

     

       168
       168
       +
           else

     

       169
       169
       +
               mkdir -p /run/log

     

       170
       170
       +
               exec > >(tee -i /run/log/stage-2-init.log) 2>&1

     

       171
       171
       +
           fi

     

       172
       172
       +
       fi

     

       173
       173
       +
       

     

       174
       174
       +
       

     

       158
       175
        
       # Run the script that performs all configuration activation that does

     

       159
       176
        
       # not have to be done at boot time.

     

       160
       177
        
       echo "running activation script..."

     
···

       180
       197
        
       

     

       181
       198
        
       # Run any user-specified commands.

     

       182
       199
        
       @shell@ @postBootCommands@

     

       200
       200
       +
       

     

       201
       201
       +
       

     

       202
       202
       +
       # Reset the logging file descriptors

     

       203
       203
       +
       if test -n "@logCommands@"; then

     

       204
       204
       +
           exec 1>&$logOutFd 2>&$logErrFd

     

       205
       205
       +
           exec {logOutFd}>&- {logErrFd}>&-

     

       206
       206
       +
       fi 

     

       183
       207
        
       

     

       184
       208
        
       

     

       185
       209
        
       # Start systemd.

+9 -1

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;

     

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

     

       21
       21
        
           inherit (config.nix) readOnlyStore;

     

       22
       22
        
           inherit (config.networking) useHostResolvConf;

     

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

     
···

       39
       39
        
         options = {

     

       40
       40
        
       

     

       41
       41
        
           boot = {

     

       42
       42
       +
       

     

       43
       43
       +
             logCommands = mkOption {

     

       44
       44
       +
               default = false;

     

       45
       45
       +
               type = types.bool;

     

       46
       46
       +
               description = ''

     

       47
       47
       +
                 Whether to replicate command output of stage-1 booting to <filename>/dev/kmsg</filename> or <filename>/run/log/stage-2-init.log</filename> if <filename>/dev/kmsg</filename> is not writable.

     

       48
       48
       +
               '';

     

       49
       49
       +
             };

     

       42
       50
        
       

     

       43
       51
        
             postBootCommands = mkOption {

     

       44
       52
        
               default = "";