From c6f350df370b418343158c6308fa6e6255dd7ae4 Mon Sep 17 00:00:00 2001 From: keramida Date: Tue, 9 Nov 2004 21:33:19 +0000 Subject: [PATCH] Revert the noexec,nosuid,nodev options for md /tmp file systems, since the change in the default behavior may break existing, working setups. Requested by: brooks --- etc/defaults/rc.conf | 2 +- share/man/man5/rc.conf.5 | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 4d792653f998..cfc8dd66e6e4 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -40,7 +40,7 @@ pccard_ether_delay="5" # Delay before trying to start dhclient in pccard_ether removable_interfaces="" # Removable network interfaces for /etc/pccard_ether. tmpmfs="AUTO" # Set to YES to always create an mfs /tmp, NO to never tmpsize="20m" # Size of mfs /tmp if created -tmpmfs_flags="-S -o noexec,nosuid,nodev" # Extra mdmfs options for the mfs /tmp +tmpmfs_flags="-S" # Extra mdmfs options for the mfs /tmp varmfs="AUTO" # Set to YES to always create an mfs /var, NO to never varsize="32m" # Size of mfs /var if created varmfs_flags="-S" # Extra mount options for the mfs /var diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 2e50b6f3486b..27832320e106 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -247,11 +247,10 @@ utility when the memory file system for .Pa /tmp is created. The default is -.Dq Li -S -o noexec,nosuid,nodev , +.Dq Li -S , which inhibits the use of softupdates on .Pa /tmp -to waste as little space as possible and mounts the memory file system -.Dq Li noexec,nosuid,nodev . +to waste as little space as possible. See .Xr mdmfs 8 for other options you can use in