Merge ^/head r296007 through r296368.

7 files changed, 9 insertions, 34 deletions

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 12bf3f2..0959c18 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -221,7 +221,7 @@ cloned_interfaces=""		# List of cloned network interfaces to create.
 #vlans_fxp0="101 vlan0"		# vlan(4) interfaces for fxp0 device
 #create_args_vlan0="vlan 102"	# vlan tag for vlan0 device
 #wlans_ath0="wlan0"		# wlan(4) interfaces for ath0 device
-#wlandebug_wlan0="scan+auth+assoc"	# Set debug flags with wlanddebug(8)
+#wlandebug_wlan0="scan+auth+assoc"	# Set debug flags with wlandebug(8)
 #ipv4_addrs_fxp0="192.168.0.1/24 192.168.1.1-5/28" # example IPv4 address entry.
 #
 #autobridge_interfaces="bridge0"	# List of bridges to check
@@ -681,7 +681,6 @@ newsyslog_enable="YES"	# Run newsyslog at startup.
 newsyslog_flags="-CN"	# Newsyslog flags to create marked files
 mixer_enable="YES"	# Run the sound mixer.
 opensm_enable="NO"	# Opensm(8) for infiniband devices defaults to off
-casperd_enable="YES"	# casperd(8) daemon
 
 # rctl(8) requires kernel options RACCT and RCTL
 rctl_enable="YES"		# Load rctl(8) rules on boot
diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
index bcb960f..9497ce7 100644
--- a/etc/mtree/BSD.debug.dist
+++ b/etc/mtree/BSD.debug.dist
@@ -13,12 +13,12 @@
             ..
         ..
         lib
+            casper
+            ..
             geom
             ..
         ..
         libexec
-            casper
-            ..
         ..
         sbin
         ..
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 88e80e6..a9baa7e 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -93,6 +93,8 @@
         scsi
         ..
     ..
+    casper
+    ..
     crypto
     ..
     dev
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index af2f6a9..1c1a1dd 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -80,12 +80,12 @@
         ..
     ..
     lib
+        casper
+        ..
         geom
         ..
     ..
     libexec
-        casper
-        ..
         resolvconf
         ..
     ..
diff --git a/etc/network.subr b/etc/network.subr
index 0e5911b..2410e2d 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -214,16 +214,14 @@ ifconfig_up()
 	ifalias $1 link alias
 	ifalias $1 ether alias
 
-	if [ ${_cfg} -eq 0 ]; then
-		${IFCONFIG_CMD} $1 up
-	fi
-
 	if wpaif $1; then
 		/etc/rc.d/wpa_supplicant start $1
 		_cfg=0		# XXX: not sure this should count
 	elif hostapif $1; then
 		/etc/rc.d/hostapd start $1
 		_cfg=0
+	elif [ ${_cfg} -eq 0 ]; then
+		${IFCONFIG_CMD} $1 up
 	fi
 
 	if dhcpif $1; then
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 1e6e28f..6cc860b 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -21,7 +21,6 @@ FILES=	DAEMON \
 	${_bluetooth} \
 	bridge \
 	${_bthidd} \
-	${_casperd} \
 	cleanvar \
 	cleartmp \
 	cron \
@@ -176,10 +175,6 @@ FILES+=		bootparams
 FILES+=		bsnmpd
 .endif
 
-.if ${MK_CASPER} != "no"
-_casperd=	casperd
-.endif
-
 .if ${MK_CCD} != "no"
 FILES+=		ccd
 .endif
diff --git a/etc/rc.d/casperd b/etc/rc.d/casperd
deleted file mode 100644
index 0b80169..0000000
--- a/etc/rc.d/casperd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: casperd
-# REQUIRE: NETWORKING syslogd
-# BEFORE:  DAEMON
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="casperd"
-rcvar="casperd_enable"
-pidfile="/var/run/${name}.pid"
-command="/sbin/${name}"
-
-load_rc_config $name
-run_rc_command "$1"