diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh index f8cd3e913c3..0df20b33b8b 100644 --- a/modules/system/boot/stage-2-init.sh +++ b/modules/system/boot/stage-2-init.sh @@ -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