diff options
| author | Emmanuel Vadot <manu@FreeBSD.org> | 2024-02-27 17:33:52 +0000 |
|---|---|---|
| committer | Emmanuel Vadot <manu@FreeBSD.org> | 2024-06-04 11:38:54 +0000 |
| commit | ac658a7c760d9db9fcd11cdeb3b858411dedf754 (patch) | |
| tree | 63600c2b081db58e7897a702f050defca9dcc6c6 | |
| parent | c98427285ad31a352f7234fa5b6ff32d817cfaa7 (diff) | |
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
(cherry picked from commit 72b045386dd3db8b31ec3067cb9e160cbd1cfbc6)
| -rw-r--r-- | libexec/rc/rc.conf | 4 | ||||
| -rwxr-xr-x | libexec/rc/rc.d/var_run | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 7f9e67981eec..a7b149bb0cd4 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 |