commit 16a907b00bc0aea1def4a39596fd745ad7705206 · pyrox.dev/nixpkgs

+18 -1

nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix

···

       30
       30
        
               '';

     

       31
       31
        
             };

     

       32
       32
        
       

     

       33
       33
       +
             useGenerationDeviceTree = mkOption {

     

       34
       34
       +
               default = true;

     

       35
       35
       +
               type = types.bool;

     

       36
       36
       +
               description = ''

     

       37
       37
       +
                 Whether to generate Device Tree-related directives in the

     

       38
       38
       +
                 extlinux configuration.

     

       39
       39
       +
       

     

       40
       40
       +
                 When enabled, the bootloader will attempt to load the device

     

       41
       41
       +
                 tree binaries from the generation's kernel.

     

       42
       42
       +
       

     

       43
       43
       +
                 Note that this affects all generations, regardless of the

     

       44
       44
       +
                 setting value used in their configurations.

     

       45
       45
       +
               '';

     

       46
       46
       +
             };

     

       47
       47
       +
       

     

       33
       48
        
             configurationLimit = mkOption {

     

       34
       49
        
               default = 20;

     

       35
       50
        
               example = 10;

     
···

       54
       69
        
         };

     

       55
       70
        
       

     

       56
       71
        
         config = let

     

       57
       57
       -
           builderArgs = "-g ${toString cfg.configurationLimit} -t ${timeoutStr}" + lib.optionalString (dtCfg.name != null) " -n ${dtCfg.name}";

     

       72
       72
       +
           builderArgs = "-g ${toString cfg.configurationLimit} -t ${timeoutStr}"

     

       73
       73
       +
             + lib.optionalString (dtCfg.name != null) " -n ${dtCfg.name}"

     

       74
       74
       +
             + lib.optionalString (!cfg.useGenerationDeviceTree) " -r";

     

       58
       75
        
         in

     

       59
       76
        
           mkIf cfg.enable {

     

       60
       77
        
             system.build.installBootLoader = "${builder} ${builderArgs} -c";

+9 -3

nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh

···

       6
       6
        
       for i in @path@; do PATH=$PATH:$i/bin; done

     

       7
       7
        
       

     

       8
       8
        
       usage() {

     

       9
       9
       -
           echo "usage: $0 -t <timeout> -c <path-to-default-configuration> [-d <boot-dir>] [-g <num-generations>] [-n <dtbName>]" >&2

     

       9
       9
       +
           echo "usage: $0 -t <timeout> -c <path-to-default-configuration> [-d <boot-dir>] [-g <num-generations>] [-n <dtbName>] [-r]" >&2

     

       10
       10
        
           exit 1

     

       11
       11
        
       }

     

       12
       12
        
       

     
···

       15
       15
        
       target=/boot            # Target directory

     

       16
       16
        
       numGenerations=0        # Number of other generations to include in the menu

     

       17
       17
        
       

     

       18
       18
       -
       while getopts "t:c:d:g:n:" opt; do

     

       18
       18
       +
       while getopts "t:c:d:g:n:r" opt; do

     

       19
       19
        
           case "$opt" in

     

       20
       20
        
               t) # U-Boot interprets '0' as infinite and negative as instant boot

     

       21
       21
        
                   if [ "$OPTARG" -lt 0 ]; then

     
···

       30
       30
        
               d) target="$OPTARG" ;;

     

       31
       31
        
               g) numGenerations="$OPTARG" ;;

     

       32
       32
        
               n) dtbName="$OPTARG" ;;

     

       33
       33
       +
               r) noDeviceTree=1 ;;

     

       33
       34
        
               \?) usage ;;

     

       34
       35
        
           esac

     

       35
       36
        
       done

     
···

       96
       97
        
           fi

     

       97
       98
        
           echo "  LINUX ../nixos/$(basename $kernel)"

     

       98
       99
        
           echo "  INITRD ../nixos/$(basename $initrd)"

     

       100
       100
       +
           echo "  APPEND init=$path/init $extraParams"

     

       101
       101
       +
       

     

       102
       102
       +
           if [ -n "$noDeviceTree" ]; then

     

       103
       103
       +
               return

     

       104
       104
       +
           fi

     

       105
       105
       +
       

     

       99
       106
        
           if [ -d "$dtbDir" ]; then

     

       100
       107
        
               # if a dtbName was specified explicitly, use that, else use FDTDIR

     

       101
       108
        
               if [ -n "$dtbName" ]; then

     
···

       109
       116
        
                   exit 1

     

       110
       117
        
               fi

     

       111
       118
        
           fi

     

       112
       112
       -
           echo "  APPEND init=$path/init $extraParams"

     

       113
       119
        
       }

     

       114
       120
        
       

     

       115
       121
        
       tmpFile="$target/extlinux/extlinux.conf.tmp.$$"