[src/trunk]: src/distrib/utils/embedded consolidate all of the volatile /var....

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4569802f3fa0
branches:  trunk
changeset: 777675:4569802f3fa0
user:      agc <agc%NetBSD.org@localhost>
date:      Wed Feb 29 04:49:50 2012 +0000

description:
consolidate all of the volatile /var.* directories which are mounted as tmpfs
into a single one for /var - same as /root, /etc

diffstat:

 distrib/utils/embedded/mkimage |  18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diffs (54 lines):

diff -r 73625770ca1d -r 4569802f3fa0 distrib/utils/embedded/mkimage
--- a/distrib/utils/embedded/mkimage    Wed Feb 29 02:40:28 2012 +0000
+++ b/distrib/utils/embedded/mkimage    Wed Feb 29 04:49:50 2012 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: mkimage,v 1.2 2012/01/20 02:19:47 agc Exp $
+# $NetBSD: mkimage,v 1.3 2012/02/29 04:49:50 agc Exp $
 
 # Copyright (c) 2012 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -92,7 +92,7 @@
 setsdir=/usr/build/release/$(uname -m)/binary/sets
 size=0 # in MB
 specialdirs="/kern /proc"
-usermodedirs="/var.run /var.log /etc.cow /root.cow /pkgs"
+usermodedirs="/var.cow /etc.cow /root.cow /pkgs"
 sudo="sudo"
 
 while [ $# -gt 0 ]; do
@@ -168,20 +168,16 @@
 # mount /etc as tmpfs on top of existing dir
 tmpfs           /etc.cow        tmpfs   rw,-s12M        0 0
 /etc.cow        /etc            union   rw,hidden       0 0
-# mount /var/run as tmpfs on top of existing dir
-tmpfs           /var.run        tmpfs   rw,-s1M         0 0
-/var.run        /var/run        union   rw,hidden       - -
-# mount /var/log as tmpfs on top of existing dir
-tmpfs           /var.log        tmpfs   rw,-s10M        0 0
-/var.log        /var/log        union   rw,hidden       - -
-tmpfs           /var/db         tmpfs   rw,-s8M         0 0
+# mount /var as tmpfs on top of existing dir
+tmpfs           /var.cow        tmpfs   rw,-s32M         0 0
+/var.cow        /var            union   rw,hidden       - -
 tmpfs           /tmp            tmpfs   rw,-s32M        0 0
 /dev/cd0a       /cdrom          cd9660  ro,noauto
 EOF
 ${sudo} mv ${tmp} /mnt/etc/fstab
 
 cat > ${tmp} << EOF
-#       $NetBSD: mkimage,v 1.2 2012/01/20 02:19:47 agc Exp $
+#       $NetBSD: mkimage,v 1.3 2012/02/29 04:49:50 agc Exp $
 #
 # see rc.conf(5) for more information.
 #
@@ -201,7 +197,7 @@
 rc_configured=YES
 
 # make sure we have the right rw filesystem at boot
-critical_filesystems_local="/var/db /var.run /var/run /var.log /var/log /etc.cow /etc /root.cow /root"
+critical_filesystems_local="/var.cow /var /etc.cow /etc /root.cow /root"
 
 # Add local overrides below
 #