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

boot.initrd: add verbose option

Browse source
This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2021-01-03 10:09:30 +01:00
parent 071eb8b265
commit bc1b5fdfe0
No known key found for this signature in database
GPG key ID: DE62E1E2A6145556
2 changed files with 33 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,13 @@
targetRoot=/mnt-root
console=tty1
verbose="@verbose@"
info() {
if [[ -n "$verbose" ]]; then
echo "$@"
fi
}
extraUtils="@extraUtils@"
export LD_LIBRARY_PATH=@extraUtils@/lib
@ -55,7 +62,7 @@ EOF
echo "Rebooting..."
reboot -f
else
echo "Continuing..."
info "Continuing..."
fi
}
@ -63,9 +70,9 @@ trap 'fail' 0
# Print a greeting.
echo
echo "<<< NixOS Stage 1 >>>"
echo
info
info "<<< NixOS Stage 1 >>>"
info
# Make several required directories.
mkdir -p /etc/udev
@ -210,14 +217,14 @@ ln -s @modulesClosure@/lib/modules /lib/modules
ln -s @modulesClosure@/lib/firmware /lib/firmware
echo @extraUtils@/bin/modprobe > /proc/sys/kernel/modprobe
for i in @kernelModules@; do
echo "loading module $(basename $i)..."
info "loading module $(basename $i)..."
modprobe $i
done
# Create device nodes in /dev.
@preDeviceCommands@
echo "running udev..."
info "running udev..."
ln -sfn /proc/self/fd /dev/fd
ln -sfn /proc/self/fd/0 /dev/stdin
ln -sfn /proc/self/fd/1 /dev/stdout
@ -235,8 +242,7 @@ udevadm settle
# XXX: Use case usb->lvm will still fail, usb->luks->lvm is covered
@preLVMCommands@
echo "starting device mapper and LVM..."
info "starting device mapper and LVM..."
lvm vgchange -ay
if test -n "$debug1devices"; then fail; fi
@ -379,7 +385,7 @@ mountFS() {
done
fi
echo "mounting $device on $mountPoint..."
info "mounting $device on $mountPoint..."
mkdir -p "/mnt-root$mountPoint"

19
nixos/modules/system/boot/stage-1.nix
View file

@ -280,7 +280,7 @@ let
inherit (config.system.build) earlyMountScript;
inherit (config.boot.initrd) checkJournalingFS
inherit (config.boot.initrd) checkJournalingFS verbose
preLVMCommands preDeviceCommands postDeviceCommands postMountCommands preFailCommands kernelModules;
resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}")
@ -560,6 +560,23 @@ in
description = "Names of supported filesystem types in the initial ramdisk.";
};
boot.initrd.verbose = mkOption {
default = true;
type = types.bool;
description =
''
Verbosity of the initrd. Please note that disabling verbosity removes
only the mandatory messages generated by the NixOS scripts. For a
completely silent boot, you might also want to set the two following
configuration options:
<itemizedlist>
<listitem><para><literal>boot.consoleLogLevel = 0;</literal></para></listitem>
<listitem><para><literal>boot.kernelParams = [ "quiet" "udev.log_priority=3" ];</literal></para></listitem>
</itemizedlist>
'';
};
boot.loader.supportsInitrdSecrets = mkOption
{ internal = true;
default = false;