diff options
| author | sjg <sjg@FreeBSD.org> | 2014-05-08 23:54:15 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-05-08 23:54:15 +0000 |
| commit | ed3fc70bf5a8edaf648093b11acca450802244ef (patch) | |
| tree | 8ce0ddd0e6f508bd20c77429c448969589170fae /etc | |
| parent | d4e443e0426fee44056ba3c1123455666d083aef (diff) | |
| parent | a2e6be0add027bf3e713c0d56ba9715b83a01144 (diff) | |
| download | FreeBSD-src-ed3fc70bf5a8edaf648093b11acca450802244ef.zip FreeBSD-src-ed3fc70bf5a8edaf648093b11acca450802244ef.tar.gz | |
Merge from head
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 2 | ||||
| -rw-r--r-- | etc/defaults/rc.conf | 6 | ||||
| -rw-r--r-- | etc/mtree/BSD.tests.dist | 2 | ||||
| -rw-r--r-- | etc/mtree/Makefile | 2 | ||||
| -rw-r--r-- | etc/periodic/daily/Makefile | 2 | ||||
| -rw-r--r-- | etc/periodic/monthly/Makefile | 2 | ||||
| -rw-r--r-- | etc/periodic/security/Makefile | 2 | ||||
| -rw-r--r-- | etc/periodic/weekly/Makefile | 2 | ||||
| -rw-r--r-- | etc/rc.d/Makefile | 2 |
9 files changed, 10 insertions, 12 deletions
diff --git a/etc/Makefile b/etc/Makefile index 340ade4..03edb13 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,7 +1,7 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> .if ${MK_SENDMAIL} != "no" SUBDIR= sendmail diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 0d4b742..aa19b30 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -641,10 +641,10 @@ devfs_rulesets="/etc/defaults/devfs.rules /etc/devfs.rules" # Files containing devfs_system_ruleset="" # The name (NOT number) of a ruleset to apply to /dev devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to # apply (must be mounted already, i.e. fstab(5)) -devfs_load_rulesets="NO" # Enable to always load the default rulesets -performance_cx_lowest="HIGH" # Online CPU idle state +devfs_load_rulesets="YES" # Enable to always load the default rulesets +performance_cx_lowest="Cmax" # Online CPU idle state performance_cpu_freq="NONE" # Online CPU frequency -economy_cx_lowest="HIGH" # Offline CPU idle state +economy_cx_lowest="Cmax" # Offline CPU idle state economy_cpu_freq="NONE" # Offline CPU frequency virecover_enable="YES" # Perform housekeeping for the vi(1) editor ugidfw_enable="NO" # Load mac_bsdextended(4) rules on boot diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 4cc3f87..2e6d30a 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -97,8 +97,6 @@ .. growfs .. - ifconfig - .. mdconfig .. .. diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile index f24867b..afed370 100644 --- a/etc/mtree/Makefile +++ b/etc/mtree/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> FILES= ${_BSD.debug.dist} \ BSD.include.dist \ diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile index aa28351..61ede6d 100644 --- a/etc/periodic/daily/Makefile +++ b/etc/periodic/daily/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> FILES= 100.clean-disks \ 110.clean-tmps \ diff --git a/etc/periodic/monthly/Makefile b/etc/periodic/monthly/Makefile index d9e4969..ea2bd9f 100644 --- a/etc/periodic/monthly/Makefile +++ b/etc/periodic/monthly/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> FILES= 450.status-security \ 999.local diff --git a/etc/periodic/security/Makefile b/etc/periodic/security/Makefile index c5af2f8..026948b 100644 --- a/etc/periodic/security/Makefile +++ b/etc/periodic/security/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> FILES= 100.chksetuid \ 110.neggrpperm \ diff --git a/etc/periodic/weekly/Makefile b/etc/periodic/weekly/Makefile index b6f77c4..865ef53 100644 --- a/etc/periodic/weekly/Makefile +++ b/etc/periodic/weekly/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> FILES= 340.noid \ 450.status-security \ diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 6c6801b..7302d29 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> FILES= DAEMON \ FILESYSTEMS \ |
