From b25ee09ceb82702a0797744e255f60b08775a086 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Feb 2009 16:19:59 +0000
Subject: [PATCH] * Remove /var/lock on startup. * Remove /etc/mtab on startup.
  This fixes the warning on   startup when catting /proc/mount to /etc/mtab.

svn path=/nixos/trunk/; revision=13986
---
 boot/boot-stage-2-init.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh
index 3c69265b51d8..a5f94bf2ad2d 100644
--- a/boot/boot-stage-2-init.sh
+++ b/boot/boot-stage-2-init.sh
@@ -30,8 +30,9 @@ test -e /etc/fstab || touch /etc/fstab # to shut up mount
 mkdir -m 0755 -p /proc
 mount -n -t proc none /proc
 [ -s /etc/mtab ] && rm /etc/mtab # while installing a symlink is created (see man mount), if it's still there for whateever reason remove it
+
+rm -f /etc/mtab
 cat /proc/mounts > /etc/mtab
-mkdir -m 0755 -p /etc/nixos
 
 
 # Process the kernel command line.
@@ -80,10 +81,12 @@ mkdir -m 0755 -p /nix/var
 mkdir -m 0700 -p /root
 mkdir -m 0755 -p /bin # for the /bin/sh symlink
 mkdir -m 0755 -p /home
+mkdir -m 0755 -p /etc/nixos
 
 
 # Miscellaneous boot time cleanup.
 rm -rf /var/run
+rm -rf /var/lock
 
 #echo -n "cleaning \`/tmp'..."
 #rm -rf --one-file-system /tmp/*