MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nixos/stage-2: Added boot.logCommands

Browse source
This commit is contained in:
Roger Qiu 2016-02-22 16:42:51 +11:00 committed by Eelco Dolstra
parent 142f65e07a
commit 474d5a7bd0
2 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
nixos/modules/system/boot/stage-2-init.sh
View file

@ -155,6 +155,23 @@ mkdir -m 0755 -p /var/setuid-wrappers
mount -t tmpfs -o "mode=0755" tmpfs /var/setuid-wrappers
# Optionally log the script output to /dev/kmsg or /run/log/stage-2-init.log.
# Only at this point are all the necessary prerequisites ready for these commands.
if test -n "@logCommands@"; then
exec {logOutFd}>&1 {logErrFd}>&2
if test -w /dev/kmsg; then
exec > >(tee -i /proc/self/fd/"$logOutFd" | while read line; do
if test -n "$line"; then
echo "stage-2-init: $line" > /dev/kmsg
fi
done) 2>&1
else
mkdir -p /run/log
exec > >(tee -i /run/log/stage-2-init.log) 2>&1
fi
fi
# Run the script that performs all configuration activation that does
# not have to be done at boot time.
echo "running activation script..."
@ -182,6 +199,13 @@ ln -sfn /run/booted-system /nix/var/nix/gcroots/booted-system
@shell@ @postBootCommands@
# Reset the logging file descriptors
if test -n "@logCommands@"; then
exec 1>&$logOutFd 2>&$logErrFd
exec {logOutFd}>&- {logErrFd}>&-
fi
# Start systemd.
echo "starting systemd..."
PATH=/run/current-system/systemd/lib/systemd \

10
nixos/modules/system/boot/stage-2.nix
View file

@ -17,7 +17,7 @@ let
src = ./stage-2-init.sh;
shellDebug = "${pkgs.bashInteractive}/bin/bash";
isExecutable = true;
inherit (config.boot) devShmSize runSize;
inherit (config.boot) logCommands devShmSize runSize;
inherit (config.nix) readOnlyStore;
inherit (config.networking) useHostResolvConf;
ttyGid = config.ids.gids.tty;
@ -40,6 +40,14 @@ in
boot = {
logCommands = mkOption {
default = false;
type = types.bool;
description = ''
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.
'';
};
postBootCommands = mkOption {
default = "";
example = "rm -f /var/log/messages";