View | Details | Raw Unified | Return to bug 253959 | Differences between
and this patch

Collapse All | Expand All

(-)b/sbin/devd/devd.conf (-12 / +12 lines)
Lines 58-64 notify 0 { Link Here
58
	match "system"		"IFNET";
58
	match "system"		"IFNET";
59
	match "type"		"LINK_UP";
59
	match "type"		"LINK_UP";
60
	media-type		"ethernet";
60
	media-type		"ethernet";
61
	action "service dhclient quietstart $subsystem";
61
	action "service -L dhclient quietstart $subsystem";
62
};
62
};
63
63
64
#
64
#
Lines 77-83 notify 0 { Link Here
77
	match "system"		"IFNET";
77
	match "system"		"IFNET";
78
	match "type"		"LINK_UP";
78
	match "type"		"LINK_UP";
79
	media-type		"802.11";
79
	media-type		"802.11";
80
	action "service dhclient quietstart $subsystem";
80
	action "service -L dhclient quietstart $subsystem";
81
};
81
};
82
82
83
# An entry like this might be in a different file, but is included here
83
# An entry like this might be in a different file, but is included here
Lines 95-105 detach 100 { Link Here
95
# When a USB Bluetooth dongle appears, activate it
95
# When a USB Bluetooth dongle appears, activate it
96
attach 100 {
96
attach 100 {
97
	device-name "ubt[0-9]+";
97
	device-name "ubt[0-9]+";
98
	action "service bluetooth quietstart $device-name";
98
	action "service -L bluetooth quietstart $device-name";
99
};
99
};
100
detach 100 {
100
detach 100 {
101
	device-name "ubt[0-9]+";
101
	device-name "ubt[0-9]+";
102
	action "service bluetooth quietstop $device-name";
102
	action "service -L bluetooth quietstop $device-name";
103
};
103
};
104
104
105
# Firmware downloader for Atheros AR3011 based USB Bluetooth devices
105
# Firmware downloader for Atheros AR3011 based USB Bluetooth devices
Lines 112-122 detach 100 { Link Here
112
# When a USB keyboard arrives, attach it as the console keyboard.
112
# When a USB keyboard arrives, attach it as the console keyboard.
113
attach 100 {
113
attach 100 {
114
	device-name "ukbd0";
114
	device-name "ukbd0";
115
	action "service syscons setkeyboard /dev/ukbd0";
115
	action "service -L syscons setkeyboard /dev/ukbd0";
116
};
116
};
117
detach 100 {
117
detach 100 {
118
	device-name "ukbd0";
118
	device-name "ukbd0";
119
	action "service syscons setkeyboard /dev/kbd0";
119
	action "service -L syscons setkeyboard /dev/kbd0";
120
};
120
};
121
121
122
notify 100 {
122
notify 100 {
Lines 125-131 notify 100 { Link Here
125
	match "type" "CREATE";
125
	match "type" "CREATE";
126
	match "cdev" "atp[0-9]+";
126
	match "cdev" "atp[0-9]+";
127
127
128
	action "service moused quietstart $cdev";
128
	action "service -L moused quietstart $cdev";
129
};
129
};
130
130
131
notify 100 {
131
notify 100 {
Lines 134-140 notify 100 { Link Here
134
	match "type" "CREATE";
134
	match "type" "CREATE";
135
	match "cdev" "ums[0-9]+";
135
	match "cdev" "ums[0-9]+";
136
136
137
	action "service moused quietstart $cdev";
137
	action "service -L moused quietstart $cdev";
138
};
138
};
139
139
140
notify 100 {
140
notify 100 {
Lines 143-149 notify 100 { Link Here
143
	match "type" "CREATE";
143
	match "type" "CREATE";
144
	match "cdev" "wsp[0-9]+";
144
	match "cdev" "wsp[0-9]+";
145
145
146
	action "service moused quietstart $cdev";
146
	action "service -L moused quietstart $cdev";
147
};
147
};
148
148
149
notify 100 {
149
notify 100 {
Lines 152-158 notify 100 { Link Here
152
	match "type" "DESTROY";
152
	match "type" "DESTROY";
153
	match "cdev" "ums[0-9]+";
153
	match "cdev" "ums[0-9]+";
154
154
155
	action "service moused stop $cdev";
155
	action "service -L moused stop $cdev";
156
};
156
};
157
157
158
# This entry starts the ColdSync tool in daemon mode. Make sure you have an up
158
# This entry starts the ColdSync tool in daemon mode. Make sure you have an up
Lines 219-225 nomatch 10 { Link Here
219
notify 10 {
219
notify 10 {
220
	match "system"		"ACPI";
220
	match "system"		"ACPI";
221
	match "subsystem"	"ACAD";
221
	match "subsystem"	"ACAD";
222
	action "service power_profile $notify";
222
	action "service -L power_profile $notify";
223
};
223
};
224
224
225
# Notify all users before beginning emergency shutdown when we get
225
# Notify all users before beginning emergency shutdown when we get
Lines 300-306 notify 10 { Link Here
300
notify 0 {
300
notify 0 {
301
	match "system"		"RCTL";
301
	match "system"		"RCTL";
302
	match "rule"		"user:770:swap:.*";
302
	match "rule"		"user:770:swap:.*";
303
	action			"service postgresql restart";
303
	action			"service -L postgresql restart";
304
};
304
};
305
305
306
# Discard autofs caches, useful for the -media special map.
306
# Discard autofs caches, useful for the -media special map.
(-)b/sbin/devd/devmatch.conf (-1 / +1 lines)
Lines 9-15 Link Here
9
#
9
#
10
# Generic NOMATCH event
10
# Generic NOMATCH event
11
nomatch 100 {
11
nomatch 100 {
12
	action "service devmatch quietstart '?'$_";
12
	action "service -L devmatch quietstart '?'$_";
13
};
13
};
14
14
15
# Add the following to devd.conf to prevent this from running:
15
# Add the following to devd.conf to prevent this from running:
(-)b/usr.sbin/service/service.sh (-2 / +8 lines)
Lines 44-60 usage () { Link Here
44
	echo '-e	Show services that are enabled'
44
	echo '-e	Show services that are enabled'
45
	echo "-R	Stop and start enabled $local_startup services"
45
	echo "-R	Stop and start enabled $local_startup services"
46
	echo "-l	List all scripts in /etc/rc.d and $local_startup"
46
	echo "-l	List all scripts in /etc/rc.d and $local_startup"
47
	echo "-L        Disable environment variable definitions from login.conf"
47
	echo '-r	Show the results of boot time rcorder'
48
	echo '-r	Show the results of boot time rcorder'
48
	echo '-v	Verbose'
49
	echo '-v	Verbose'
49
	echo ''
50
	echo ''
50
}
51
}
51
52
52
while getopts 'j:ehlrRv' COMMAND_LINE_ARGUMENT ; do
53
while getopts 'j:ehlLrRv' COMMAND_LINE_ARGUMENT ; do
53
	case "${COMMAND_LINE_ARGUMENT}" in
54
	case "${COMMAND_LINE_ARGUMENT}" in
54
	j)	JAIL="${OPTARG}" ;;
55
	j)	JAIL="${OPTARG}" ;;
55
	e)	ENABLED=eopt ;;
56
	e)	ENABLED=eopt ;;
56
	h)	usage ; exit 0 ;;
57
	h)	usage ; exit 0 ;;
57
	l)	LIST=lopt ;;
58
	l)	LIST=lopt ;;
59
	L)	DISABLE_LOGIN=1 ;;
58
	r)	RCORDER=ropt ;;
60
	r)	RCORDER=ropt ;;
59
	R)	RESTART=Ropt ;;
61
	R)	RESTART=Ropt ;;
60
	v)	VERBOSE=vopt ;;
62
	v)	VERBOSE=vopt ;;
Lines 165-171 cd / Link Here
165
for dir in /etc/rc.d $local_startup; do
167
for dir in /etc/rc.d $local_startup; do
166
	if [ -x "$dir/$script" ]; then
168
	if [ -x "$dir/$script" ]; then
167
		[ -n "$VERBOSE" ] && echo "$script is located in $dir"
169
		[ -n "$VERBOSE" ] && echo "$script is located in $dir"
168
		exec env -i -L 0/daemon HOME=/ PATH=/sbin:/bin:/usr/sbin:/usr/bin "$dir/$script" "$@"
170
		if [ -n "${DISABLE_LOGIN}" ]; then
171
			exec env -i HOME=/ PATH=/sbin:/bin:/usr/sbin:/usr/bin "$dir/$script" "$@"
172
		else
173
			exec env -i -L 0/daemon HOME=/ PATH=/sbin:/bin:/usr/sbin:/usr/bin "$dir/$script" "$@"
174
		fi
169
	fi
175
	fi
170
done
176
done
171
177

Return to bug 253959