mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-15 19:38:02 +00:00
Give some progress indications during Stage2 boot
svn path=/nixos/branches/modular-nixos/; revision=16523
This commit is contained in:
parent
bef1dc8bd5
commit
f05682c84d
@ -83,11 +83,14 @@ mkdir -m 0755 -p /bin # for the /bin/sh symlink
|
||||
mkdir -m 0755 -p /home
|
||||
mkdir -m 0755 -p /etc/nixos
|
||||
|
||||
echo "Filesystems mounted"
|
||||
|
||||
# Miscellaneous boot time cleanup.
|
||||
rm -rf /var/run
|
||||
rm -rf /var/lock
|
||||
|
||||
echo "On-boot /var cleanup done"
|
||||
|
||||
#echo -n "cleaning \`/tmp'..."
|
||||
#rm -rf --one-file-system /tmp/*
|
||||
#echo " done"
|
||||
@ -98,6 +101,8 @@ rm -rf /var/lock
|
||||
# gone, of course.
|
||||
rm -rf /nix/var/nix/chroots # recreated in activate-configuration.sh
|
||||
|
||||
echo "Nix chroots removed"
|
||||
|
||||
if test -n "$safeMode"; then
|
||||
mkdir -m 0755 -p /var/run
|
||||
touch /var/run/safemode
|
||||
@ -114,11 +119,14 @@ if test -n "$resumeDevice"; then
|
||||
mkswap "$resumeDevice" || echo 'Failed to clear saved image.'
|
||||
fi
|
||||
|
||||
echo -n "Activating configuration .. "
|
||||
|
||||
# Run the script that performs all configuration activation that does
|
||||
# not have to be done at boot time.
|
||||
@activateConfiguration@ "$systemConfig"
|
||||
|
||||
echo ".. done"
|
||||
|
||||
|
||||
# Record the boot configuration. !!! Should this be a GC root?
|
||||
if test -n "$systemConfig"; then
|
||||
@ -133,6 +141,7 @@ export MODULE_DIR=@kernel@/lib/modules/
|
||||
# Run any user-specified commands.
|
||||
@shell@ @postBootCommands@
|
||||
|
||||
echo "Running Upstart"
|
||||
|
||||
# Start Upstart's init. We start it through the
|
||||
# /var/run/current-system symlink indirection so that we can upgrade
|
||||
|
Loading…
Reference in New Issue
Block a user