colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Give our kernel parameters a common prefix ("boot.*")

Browse Source
This commit is contained in:
Eelco Dolstra 2013-01-09 22:49:26 +01:00
parent 93a7a32bab
commit c7b427fbca
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/manual/troubleshooting.xml
View File

@ -16,14 +16,14 @@ systemd:
<variablelist> <variablelist>
<varlistentry><term><literal>initrd.shell_on_fail</literal></term> <varlistentry><term><literal>boot.shell_on_fail</literal></term>
<listitem><para>Start a root shell if something goes wrong in <listitem><para>Start a root shell if something goes wrong in
stage 1 of the boot process (the initial ramdisk). This is stage 1 of the boot process (the initial ramdisk). This is
disabled by default because there is no authentication for the disabled by default because there is no authentication for the
root shell.</para></listitem> root shell.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry><term><literal>debug1</literal></term> <varlistentry><term><literal>boot.debug1</literal></term>
<listitem><para>Start an interactive shell in stage 1 before <listitem><para>Start an interactive shell in stage 1 before
anything useful has been done. That is, no modules have been anything useful has been done. That is, no modules have been
loaded and no file systems have been mounted, except for loaded and no file systems have been mounted, except for
@ -31,7 +31,7 @@ systemd:
<filename>/sys</filename>.</para></listitem> <filename>/sys</filename>.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry><term><literal>debugtrace</literal></term> <varlistentry><term><literal>boot.trace</literal></term>
<listitem><para>Print every shell command executed by the stage 1 <listitem><para>Print every shell command executed by the stage 1
and 2 boot scripts.</para></listitem> and 2 boot scripts.</para></listitem>
</varlistentry> </varlistentry>

2
modules/profiles/headless.nix
View File

@ -16,5 +16,5 @@ with pkgs.lib;
boot.systemd.services."serial-getty@hvc0".enable = false; boot.systemd.services."serial-getty@hvc0".enable = false;
# Since we can't manually respond to a panic, just reboot. # Since we can't manually respond to a panic, just reboot.
boot.kernelParams = [ "panic=1" "stage1panic=1" ]; boot.kernelParams = [ "panic=1" "boot.panic_on_fail" ];
} }

2
modules/system/boot/kernel.nix
View File

@ -50,7 +50,7 @@ in
boot.extraKernelParams = mkOption { boot.extraKernelParams = mkOption {
default = [ ]; default = [ ];
example = [ "debugtrace" ]; example = [ "boot.trace" ];
description = "Additional user-defined kernel parameters."; description = "Additional user-defined kernel parameters.";
}; };

12
modules/system/boot/stage-1-init.sh
View File

@ -81,26 +81,26 @@ for o in $(cat /proc/cmdline); do
set -- $(IFS==; echo $o) set -- $(IFS==; echo $o)
stage2Init=$2 stage2Init=$2
;; ;;
debugtrace) boot.trace|debugtrace)
# Show each command. # Show each command.
set -x set -x
;; ;;
initrd.shell_on_fail) boot.shell_on_fail)
allowShell=1 allowShell=1
;; ;;
debug1) # stop right away boot.debug1|debug1) # stop right away
allowShell=1 allowShell=1
fail fail
;; ;;
debug1devices) # stop after loading modules and creating device nodes boot.debug1devices) # stop after loading modules and creating device nodes
allowShell=1 allowShell=1
debug1devices=1 debug1devices=1
;; ;;
debug1mounts) # stop after mounting file systems boot.debug1mounts) # stop after mounting file systems
allowShell=1 allowShell=1
debug1mounts=1 debug1mounts=1
;; ;;
stage1panic=1) boot.panic_on_fail|stage1panic=1)
panicOnFail=1 panicOnFail=1
;; ;;
root=*) root=*)

2
modules/system/boot/stage-2-init.sh
View File

@ -64,7 +64,7 @@ ln -s /proc/mounts /etc/mtab
# Process the kernel command line. # Process the kernel command line.
for o in $(cat /proc/cmdline); do for o in $(cat /proc/cmdline); do
case $o in case $o in
debugtrace) boot.debugtrace)
# Show each command. # Show each command.
set -x set -x
;; ;;

2
modules/testing/test-instrumentation.nix
View File

@ -65,7 +65,7 @@ let kernel = config.boot.kernelPackages.kernel; in
# Panic if an error occurs in stage 1 (rather than waiting for # Panic if an error occurs in stage 1 (rather than waiting for
# user intervention). # user intervention).
boot.kernelParams = boot.kernelParams =
[ "console=tty1" "console=ttyS0" "panic=1" "stage1panic=1" ]; [ "console=tty1" "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
# `xwininfo' is used by the test driver to query open windows. # `xwininfo' is used by the test driver to query open windows.
environment.systemPackages = [ pkgs.xorg.xwininfo ]; environment.systemPackages = [ pkgs.xorg.xwininfo ];