public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Clean up some boot messages.

Browse Source 
svn path=/nixos/trunk/; revision=16689
This commit is contained in:
Eelco Dolstra 2009-08-11 21:09:25 +00:00
parent bed6fd6a61
commit fd56f110da
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/system/boot/stage-2-init.sh
View File

@ -83,26 +83,22 @@ mkdir -m 0755 -p /bin # for the /bin/sh symlink
mkdir -m 0755 -p /home mkdir -m 0755 -p /home
mkdir -m 0755 -p /etc/nixos mkdir -m 0755 -p /etc/nixos
echo "Filesystems mounted"
# Miscellaneous boot time cleanup. # Miscellaneous boot time cleanup.
rm -rf /var/run rm -rf /var/run
rm -rf /var/lock rm -rf /var/lock
echo "On-boot /var cleanup done"
#echo -n "cleaning \`/tmp'..." #echo -n "cleaning \`/tmp'..."
#rm -rf --one-file-system /tmp/* #rm -rf --one-file-system /tmp/*
#echo " done" #echo " done"
# This is a good time to clean up /nix/var/nix/chroots. Doing an `rm # This is a good time to clean up /nix/var/nix/chroots. Doing an `rm
# -rf' on it isn't safe in general because it can contain bind mounts # -rf' on it isn't safe in general because it can contain bind mounts
# to /nix/store and other places. But after rebooting these are all # to /nix/store and other places. But after rebooting these are all
# gone, of course. # gone, of course.
rm -rf /nix/var/nix/chroots # recreated in activate-configuration.sh rm -rf /nix/var/nix/chroots # recreated in activate-configuration.sh
echo "Nix chroots removed"
if test -n "$safeMode"; then if test -n "$safeMode"; then
mkdir -m 0755 -p /var/run mkdir -m 0755 -p /var/run
touch /var/run/safemode touch /var/run/safemode
@ -119,14 +115,12 @@ if test -n "$resumeDevice"; then
mkswap "$resumeDevice" || echo 'Failed to clear saved image.' mkswap "$resumeDevice" || echo 'Failed to clear saved image.'
fi fi
echo -n "Activating configuration .. " echo "running activation script..."
# Run the script that performs all configuration activation that does # Run the script that performs all configuration activation that does
# not have to be done at boot time. # not have to be done at boot time.
@activateConfiguration@ "$systemConfig" @activateConfiguration@ "$systemConfig"
echo ".. done"
# Record the boot configuration. !!! Should this be a GC root? # Record the boot configuration. !!! Should this be a GC root?
if test -n "$systemConfig"; then if test -n "$systemConfig"; then
@ -141,7 +135,7 @@ export MODULE_DIR=@kernel@/lib/modules/
# Run any user-specified commands. # Run any user-specified commands.
@shell@ @postBootCommands@ @shell@ @postBootCommands@
echo "Running Upstart" echo "starting Upstart..."
# Start Upstart's init. We start it through the # Start Upstart's init. We start it through the
# /var/run/current-system symlink indirection so that we can upgrade # /var/run/current-system symlink indirection so that we can upgrade