From 47ff42dab2e21d6e60fcc76f3e83e2e2a511c236 Mon Sep 17 00:00:00 2001
From: rwatson <rwatson@FreeBSD.org>
Date: Tue, 27 Nov 2001 22:12:27 +0000
Subject: [PATCH] Remeber to set the permissions on an md-backed /tmp to 01777,
 rather than using the default of 0755.

---
 etc/rc.d/diskless | 1 +
 etc/rc.d/resolv   | 1 +
 etc/rc.d/tmp      | 1 +
 etc/rc.d/var      | 1 +
 etc/rc.diskless2  | 1 +
 5 files changed, 5 insertions(+)

diff --git a/etc/rc.d/diskless b/etc/rc.d/diskless
index ce883742205a..1c2e0c6a3a56 100644
--- a/etc/rc.d/diskless
+++ b/etc/rc.d/diskless
@@ -80,6 +80,7 @@ fi
 #
 # /var/tmp, otherwise, use a small memory filesystem for /tmp.
 	mount_md ${tmpsize:=20480} /tmp 2
+# XXX: mtree runs too early to create any directories needed in /tmp,
 # so if /var/tmp == /tmp, then you don't get a vi.recover.
 #
 if [ ! -h /tmp ]; then
diff --git a/etc/rc.d/resolv b/etc/rc.d/resolv
index ce883742205a..1c2e0c6a3a56 100644
--- a/etc/rc.d/resolv
+++ b/etc/rc.d/resolv
@@ -80,6 +80,7 @@ fi
 #
 # /var/tmp, otherwise, use a small memory filesystem for /tmp.
 	mount_md ${tmpsize:=20480} /tmp 2
+# XXX: mtree runs too early to create any directories needed in /tmp,
 # so if /var/tmp == /tmp, then you don't get a vi.recover.
 #
 if [ ! -h /tmp ]; then
diff --git a/etc/rc.d/tmp b/etc/rc.d/tmp
index ce883742205a..1c2e0c6a3a56 100644
--- a/etc/rc.d/tmp
+++ b/etc/rc.d/tmp
@@ -80,6 +80,7 @@ fi
 #
 # /var/tmp, otherwise, use a small memory filesystem for /tmp.
 	mount_md ${tmpsize:=20480} /tmp 2
+# XXX: mtree runs too early to create any directories needed in /tmp,
 # so if /var/tmp == /tmp, then you don't get a vi.recover.
 #
 if [ ! -h /tmp ]; then
diff --git a/etc/rc.d/var b/etc/rc.d/var
index ce883742205a..1c2e0c6a3a56 100644
--- a/etc/rc.d/var
+++ b/etc/rc.d/var
@@ -80,6 +80,7 @@ fi
 #
 # /var/tmp, otherwise, use a small memory filesystem for /tmp.
 	mount_md ${tmpsize:=20480} /tmp 2
+# XXX: mtree runs too early to create any directories needed in /tmp,
 # so if /var/tmp == /tmp, then you don't get a vi.recover.
 #
 if [ ! -h /tmp ]; then
diff --git a/etc/rc.diskless2 b/etc/rc.diskless2
index 5ad523a80932..4c6a8c26d370 100644
--- a/etc/rc.diskless2
+++ b/etc/rc.diskless2
@@ -80,6 +80,7 @@ mount -a       # chown and chgrp are in /usr
 # /var/tmp, otherwise, use a small memory filesystem for /tmp.
 if [ ! -h /tmp ]; then
 	mount_md ${tmpsize:=20480} /tmp 2
+	chmod 01777 /tmp
 fi
 
 if sysctl vfs.devfs.generation > /dev/null 2>&1 ; then