svn commit: r211438 - in stable/7/etc: . rc.d
John Baldwin
jhb at FreeBSD.org
Tue Aug 17 21:28:41 UTC 2010
Author: jhb
Date: Tue Aug 17 21:28:40 2010
New Revision: 211438
URL: http://svn.freebsd.org/changeset/base/211438
Log:
MFC 175682,175683,175686:
Generally, anything that runs rc.d scripts internally should
start using the quiet prefix (i.e. quietstart, quietstop, etc...).
Modified:
stable/7/etc/devd.conf
stable/7/etc/netstart
stable/7/etc/rc.d/ipfw
stable/7/etc/rc.d/mountcritremote
stable/7/etc/rc.d/ppp
Directory Properties:
stable/7/etc/ (props changed)
Modified: stable/7/etc/devd.conf
==============================================================================
--- stable/7/etc/devd.conf Tue Aug 17 20:39:28 2010 (r211437)
+++ stable/7/etc/devd.conf Tue Aug 17 21:28:40 2010 (r211438)
@@ -53,7 +53,7 @@ notify 0 {
match "system" "IFNET";
match "type" "LINK_UP";
media-type "ethernet";
- action "/etc/rc.d/dhclient start $subsystem";
+ action "/etc/rc.d/dhclient quietstart $subsystem";
};
#
@@ -73,7 +73,7 @@ notify 0 {
match "system" "IFNET";
match "type" "LINK_UP";
media-type "802.11";
- action "/etc/rc.d/dhclient start $subsystem";
+ action "/etc/rc.d/dhclient quietstart $subsystem";
};
# An entry like this might be in a different file, but is included here
@@ -91,11 +91,11 @@ detach 100 {
# When a USB Bluetooth dongle appears activate it
attach 100 {
device-name "ubt[0-9]+";
- action "/etc/rc.d/bluetooth start $device-name";
+ action "/etc/rc.d/bluetooth quietstart $device-name";
};
detach 100 {
device-name "ubt[0-9]+";
- action "/etc/rc.d/bluetooth stop $device-name";
+ action "/etc/rc.d/bluetooth quietstop $device-name";
};
# When a USB keyboard arrives, attach it as the console keyboard.
@@ -112,7 +112,7 @@ detach 100 {
# stops automatically (actually it bombs :) when the device disappears.
attach 100 {
device-name "ums[0-9]+";
- action "/etc/rc.d/moused start $device-name";
+ action "/etc/rc.d/moused quietstart $device-name";
};
# Firmware download into the ActiveWire board. After the firmware download is
Modified: stable/7/etc/netstart
==============================================================================
--- stable/7/etc/netstart Tue Aug 17 20:39:28 2010 (r211437)
+++ stable/7/etc/netstart Tue Aug 17 21:28:40 2010 (r211438)
@@ -37,30 +37,32 @@
. /etc/rc.subr
load_rc_config 'XXX'
-/etc/rc.d/devd start
-/etc/rc.d/hostid start
-/etc/rc.d/hostname start
-/etc/rc.d/ipmon start
-/etc/rc.d/ipfilter start
-/etc/rc.d/ipnat start
-/etc/rc.d/ipfs start
-/etc/rc.d/sppp start
-# /etc/rc.d/atm1 start
-# . /etc/rc.d/atm2.sh start
-# . /etc/rc.d/atm3.sh start
-/etc/rc.d/netif start
-/etc/rc.d/ipsec start
-/etc/rc.d/dhclient start
-/etc/rc.d/isdnd start
-/etc/rc.d/ppp start
-/etc/rc.d/ipfw start
-/etc/rc.d/ip6fw start
-/etc/rc.d/network_ipv6 start
-/etc/rc.d/routing start
-/etc/rc.d/mroute6d start
-/etc/rc.d/route6d start
-/etc/rc.d/mrouted start
-/etc/rc.d/routed start
-/etc/rc.d/nisdomain start
+_start=quietstart
+
+/etc/rc.d/devd ${_start}
+/etc/rc.d/hostid ${_start}
+/etc/rc.d/hostname ${_start}
+/etc/rc.d/ipmon ${_start}
+/etc/rc.d/ipfilter ${_start}
+/etc/rc.d/ipnat ${_start}
+/etc/rc.d/ipfs ${_start}
+/etc/rc.d/sppp ${_start}
+# /etc/rc.d/atm1 ${_start}
+# . /etc/rc.d/atm2.sh ${_start}
+# . /etc/rc.d/atm3.sh ${_start}
+/etc/rc.d/netif ${_start}
+/etc/rc.d/ipsec ${_start}
+/etc/rc.d/dhclient ${_start}
+/etc/rc.d/isdnd ${_start}
+/etc/rc.d/ppp ${_start}
+/etc/rc.d/ipfw ${_start}
+/etc/rc.d/ip6fw ${_start}
+/etc/rc.d/network_ipv6 ${_start}
+/etc/rc.d/routing ${_start}
+/etc/rc.d/mroute6d ${_start}
+/etc/rc.d/route6d ${_start}
+/etc/rc.d/mrouted ${_start}
+/etc/rc.d/routed ${_start}
+/etc/rc.d/nisdomain ${_start}
exit 0
Modified: stable/7/etc/rc.d/ipfw
==============================================================================
--- stable/7/etc/rc.d/ipfw Tue Aug 17 20:39:28 2010 (r211437)
+++ stable/7/etc/rc.d/ipfw Tue Aug 17 21:28:40 2010 (r211438)
@@ -66,7 +66,7 @@ ipfw_poststart()
#
for _coscript in ${firewall_coscripts} ; do
if [ -f "${_coscript}" ]; then
- ${_coscript} start
+ ${_coscript} quietstart
fi
done
@@ -87,7 +87,7 @@ ipfw_stop()
#
for _coscript in `reverse_list ${firewall_coscripts}` ; do
if [ -f "${_coscript}" ]; then
- ${_coscript} stop
+ ${_coscript} quietstop
fi
done
}
Modified: stable/7/etc/rc.d/mountcritremote
==============================================================================
--- stable/7/etc/rc.d/mountcritremote Tue Aug 17 20:39:28 2010 (r211437)
+++ stable/7/etc/rc.d/mountcritremote Tue Aug 17 21:28:40 2010 (r211438)
@@ -65,7 +65,7 @@ mountcritremote_start()
done
# Cleanup /var again just in case it's a network mount.
- /etc/rc.d/cleanvar reload
+ /etc/rc.d/cleanvar quietreload
rm -f /var/run/clean_var /var/spool/lock/clean_var
}
Modified: stable/7/etc/rc.d/ppp
==============================================================================
--- stable/7/etc/rc.d/ppp Tue Aug 17 20:39:28 2010 (r211437)
+++ stable/7/etc/rc.d/ppp Tue Aug 17 21:28:40 2010 (r211438)
@@ -95,8 +95,8 @@ ppp_poststart()
{
# Re-Sync ipfilter and pf so they pick up any new network interfaces
#
- /etc/rc.d/ipfilter resync
- /etc/rc.d/pf resync
+ /etc/rc.d/ipfilter quietresync
+ /etc/rc.d/pf quietresync
}
ppp_stop_profile() {
More information about the svn-src-stable-7
mailing list