1 files changed, 13 insertions, 11 deletions

diff --git a/etc/rc.d/tmp b/etc/rc.d/tmp
index 7fc93e93bec1..9ccdfa80ed14 100644
--- a/etc/rc.d/tmp
+++ b/etc/rc.d/tmp
@@ -11,26 +11,28 @@
 	/sbin/mount /dev/md$3c $2
 }
 
-mount_mfs -s ${var_run_sectors:=2048} -T qp120at dummy /var/run
-mount_mfs -s ${var_db_sectors:=16384} -T qp120at dummy /var/db
-mount_mfs -s ${var_tmp_sectors:=65536} -T qp120at dummy /var/tmp
-mount_mfs -s ${var_spool_sectors:=65536} -T qp120at dummy /var/spool
+mount_mfs -s ${varsize:=65536} -T qp120at dummy /var
+var_dirs="run dev db msgs tmp spool spool/mqueue spool/lpd spool/output \
+	spool/output/lpd"
+for i in ${var_dirs}
+do
+    mkdir /var/${i}
+done
 chmod 755 /var/run
 chmod 755 /var/db
 chmod 755 /var/spool
 chmod 1777 /var/tmp
+chown -R root.daemon /var/spool/output
+chgrp daemon /var/spool/lpd
+# Since we are starting with a very fresh /etc on an MFS:
+if [ -d /conf/default/etc ]; then
+	newaliases
 fi
 if [ ! -h /tmp -a ! -h /var/tmp ]; then
 	mount_null /var/tmp /tmp
 fi
 #
-mkdir /var/spool/mqueue
-mkdir /var/spool/lpd
-mkdir /var/spool/output
-mkdir /var/spool/output/lpd
-chown -R root.daemon /var/spool/output
-chgrp daemon /var/spool/lpd
-
+# extract a list of device entries, then copy them to a writable partition
 (cd /; find -x dev | cpio -o -H newc) > /tmp/dev.tmp
 mount_mfs -s 4096 -i 512 -T qp120at dummy /dev
 (cd /; cpio -i -H newc -d < /tmp/dev.tmp)