Cleanup diskless support in current, mostly aligning it to the one

in the 3.x branch. Also remove the dependency on /usr to find the
boot address/interface.
Mostly-submitted-abd-tested-by: MIHIRA Sanpei Yoshiro <sanpei@sanpei.org>

1 files changed, 13 insertions, 11 deletions

diff --git a/etc/rc.diskless2 b/etc/rc.diskless2
index d7ba532..17b0bcb 100644
--- a/etc/rc.diskless2
+++ b/etc/rc.diskless2
@@ -11,26 +11,28 @@ elif [ -r /etc/rc.conf ]; then
 	. /etc/rc.conf
 fi
 
-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
+#
+# XXX make sure to create one dir for each printer as requested by lpd
+#
 
 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)