Skip to content

(nixos/system/boot): make stage-2 respect boot.initrd.verbose flag #155622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mainrs wants to merge 1 commit into from
Closed

(nixos/system/boot): make stage-2 respect boot.initrd.verbose flag #155622

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions nixos/modules/system/boot/stage-2-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
#! @shell@

systemConfig=@systemConfig@
verbose="@verbose@"
Copy link
Author

@mainrs mainrs Jan 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there still needs to be a boot.verbose flag added to stage-2.nix, similar to how it's done in stage-1.nix. Maybe it's a good idea to re-use the value of boot.initrd.verbose? I left this change out to get some feedback!


export HOME=/root PATH="@path@"

info() {
if [[ -n "$verbose" ]]; then
echo -e "$@"
fi
}

# Process the kernel command line.
for o in $(</proc/cmdline); do
Expand All @@ -21,9 +27,9 @@ done


# Print a greeting.
echo
echo -e "\e[1;32m<<< NixOS Stage 2 >>>\e[0m"
echo
info ""
info "\e[1;32m<<< NixOS Stage 2 >>>\e[0m"
info ""


# Normally, stage 1 mounts the root filesystem read/writable.
Expand Down Expand Up @@ -103,7 +109,7 @@ ln -s /run/lock /var/lock

# Clear the resume device.
if test -n "$resumeDevice"; then
mkswap "$resumeDevice" || echo 'Failed to clear saved image.'
mkswap "$resumeDevice" || info 'Failed to clear saved image.'
fi


Expand All @@ -129,7 +135,7 @@ fi

# Run the script that performs all configuration activation that does
# not have to be done at boot time.
echo "running activation script..."
info "running activation script..."
$systemConfig/activate


Expand Down Expand Up @@ -168,7 +174,7 @@ exec {logOutFd}>&- {logErrFd}>&-


# Start systemd.
echo "starting systemd..."
info "starting systemd..."

PATH=/run/current-system/systemd/lib/systemd:@fsPackagesPath@ \
LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive @systemdUnitPathEnvVar@ \
Expand Down