aboutsummaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorEmmanuel Vadot <manu@FreeBSD.org>2024-02-27 17:33:52 +0000
committerEmmanuel Vadot <manu@FreeBSD.org>2024-02-28 07:17:58 +0000
commit72b045386dd3db8b31ec3067cb9e160cbd1cfbc6 (patch)
treeea3ca77efe897fd0355f92d93a9f2fd36f1b9344 /libexec
parent749e318da39efc58107fdef517cf9c357053413a (diff)
downloadsrc-72b045386dd3db8b31ec3067cb9e160cbd1cfbc6.tar.gz
src-72b045386dd3db8b31ec3067cb9e160cbd1cfbc6.zip
rc: Set var_run_enable to enable by default
This will load/save the /var/run directories at boot/shutdown if and only if /var/run/ is a tmpfs mount so it is a win for tmpfs users and a no-op for everyone else. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D44097 Sponsored by: Beckhoff Automation GmbH & Co. KG
Diffstat (limited to 'libexec')
-rw-r--r--libexec/rc/rc.conf4
-rwxr-xr-xlibexec/rc/rc.d/var_run5
2 files changed, 2 insertions, 7 deletions
diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf
index 20f0a6375a9e..2fa3b676cb38 100644
--- a/libexec/rc/rc.conf
+++ b/libexec/rc/rc.conf
@@ -61,8 +61,8 @@ varmfs_flags="-S" # Extra mount options for the mfs /var
mfs_type="auto" # "md", "tmpfs", "auto" to prefer tmpfs with md as fallback
populate_var="AUTO" # Set to YES to always (re)populate /var, NO to never
cleanvar_enable="YES" # Clean the /var directory
-var_run_enable="NO" # Save/restore /var/run structure at shutdown/reboot
-var_run_autosave="NO" # Only restore /var/run structure at shutdown/reboot
+var_run_enable="YES" # Save/restore /var/run structure at shutdown/reboot
+var_run_autosave="YES" # Only restore /var/run structure at shutdown/reboot
# The user is expected to issue service var_run save to
# manually save the /var/run mtree
var_run_mtree="/var/db/mtree/BSD.var-run.mtree"
diff --git a/libexec/rc/rc.d/var_run b/libexec/rc/rc.d/var_run
index daff06ce1a3f..bf8f0cb737b4 100755
--- a/libexec/rc/rc.d/var_run
+++ b/libexec/rc/rc.d/var_run
@@ -17,11 +17,6 @@ stop_cmd="_var_run_stop"
load_rc_config $name
-# Set defaults
-: ${var_run_enable:="NO"}
-: ${var_run_mtree:="/var/db/mtree/BSD.var-run.mtree"}
-: ${var_run_autosave:="YES"}
-
_var_run_load() {
test -f ${var_run_mtree} &&
mtree -U -i -q -f ${var_run_mtree} -p /var/run > /dev/null