1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
|
Index: init.d/halt.sh
===================================================================
--- init.d/halt.sh (revision 1964)
+++ init.d/halt.sh (working copy)
@@ -119,9 +119,6 @@
done
eend 0
-# Try to remove any dm-crypt mappings
-stop_addon dm-crypt
-
# Stop LVM, etc
stop_volumes
Index: init.d/checkfs
===================================================================
--- init.d/checkfs (revision 1964)
+++ init.d/checkfs (working copy)
@@ -9,9 +9,6 @@
start() {
local retval=0
- # Setup dm-crypt mappings if any
- start_addon dm-crypt
-
if [[ -f /fastboot ]] || [[ -n ${CDBOOT} ]] ; then
rm -f /fastboot
else
Index: init.d/localmount
===================================================================
--- init.d/localmount (revision 1964)
+++ init.d/localmount (working copy)
@@ -38,9 +38,6 @@
ebegin "Activating (possibly) more swap"
/sbin/swapon -a
eend $?
-
- # Start dm-crypt mappings, if any
- start_addon dm-crypt
}
Index: etc/conf.d/rc
===================================================================
--- etc/conf.d/rc (revision 1964)
+++ etc/conf.d/rc (working copy)
@@ -16,6 +16,13 @@
RC_INTERACTIVE="yes"
+# Dynamic /dev managers can trigger coldplug events which cause services to
+# start before we are ready for them. If this happens, we can defer these
+# services to start in the boot runlevel. If you don't want this then set
+# RC_COLDPLUG to no.
+
+RC_COLDPLUG="yes"
+
# RC_NET_STRICT_CHECKING allows some flexibility with the 'net' service.
# The following values are allowed:
# none - The 'net' service is always considered up.
@@ -41,7 +48,7 @@
# for various volume managers (MD, EVMS2, LVM, DM, etc). Note that they are
# stopped in reverse order.
-RC_VOLUME_ORDER="raid evms lvm dm"
+RC_VOLUME_ORDER="raid evms lvm dm dm-crypt"
# RC_VERBOSE will make init scripts more verbose. Only networking scripts
# really use this at this time, and this is useful for trouble shooting
Index: lib/rcscripts/net.modules.d/udhcpc.sh
===================================================================
--- lib/rcscripts/net.modules.d/udhcpc.sh (revision 1964)
+++ lib/rcscripts/net.modules.d/udhcpc.sh (working copy)
@@ -126,9 +126,15 @@
fi
fi
- eval start-stop-daemon --start --exec /sbin/udhcpc \
- --pidfile "${pidfile}" \
- -- "${opts}" --interface="${iface}" --now \
+ # Don't use s-s-d if the user wants to quit on lease.
+ if [[ " ${opts} " == *" -q "* || " ${opts} " == *" --quit "* ]]; then
+ x="/sbin/udhcpc"
+ else
+ x="start-stop-daemon --start --exec /sbin/udhcpc \
+ --pidfile \"${pidfile}\" --"
+ fi
+
+ eval "${x}" "${opts}" --interface="${iface}" --now \
--script=/lib/rcscripts/sh/udhcpc.sh \
--pidfile="${pidfile}" >/dev/null
eend $? || return 1
Index: lib/rcscripts/net.modules.d/ccwgroup.sh
===================================================================
--- lib/rcscripts/net.modules.d/ccwgroup.sh (revision 1964)
+++ lib/rcscripts/net.modules.d/ccwgroup.sh (working copy)
@@ -11,30 +11,44 @@
ccwgroup_pre_start() {
local iface="$1" ifvar="$(bash_variable "$1")"
- local ccwgroup="ccwgroup_${ifvar}[@]"
+ local ccw="ccwgroup_${ifvar}[@]"
+ local -a ccwgroup=( "${!ccw}" )
- [[ -z ${!ccwgroup} ]] && return 0
+ [[ -z ${!ccw} ]] && return 0
if [[ ! -d /sys/bus/ccwgroup ]] ; then
eerror "ccwgroup support missing in kernel"
return 1
fi
einfo "Enabling ccwgroup on ${iface}"
- echo "${!ccwgroup// /,}" > /sys/bus/ccwgroup/drivers/qeth/group
- echo "1" > /sys/devices/qeth/"${!ccwgroup[0]}"/online
+ echo "${!ccw// /,}" > /sys/bus/ccwgroup/drivers/qeth/group
+ echo "1" > /sys/devices/qeth/"${ccwgroup[0]}"/online
eend $?
}
-ccwgroup_post_stop() {
+ccwgroup_pre_stop() {
local iface="$1"
+
+ # Erase any existing ccwgroup to be safe
+ save_options ccwgroup_device ""
[[ ! -L /sys/class/net/"${iface}"/driver ]] && return 0
local driver="$(readlink /sys/class/net/"${iface}"/driver)"
[[ ${driver} != *"/bus/ccwgroup/"* ]] && return 0
+
+ local device="$(readlink /sys/class/net/"${iface}"/device)"
+ device="${device##*/}"
+ save_options ccwgroup_device "${device}"
+}
+
+ccwgroup_post_stop() {
+ local iface="$1" device="$(get_options ccwgroup_device)"
+ [[ -z ${device} ]] && return 0
+
einfo "Disabling ccwgroup on ${iface}"
- echo "0" > /sys/class/net/"${iface}"/device/online
- echo "1" > /sys/class/net/"${iface}"/device/ungroup
+ echo "0" > /sys/devices/qeth/"${device}"/online
+ echo "1" > /sys/devices/qeth/"${device}"/ungroup
eend $?
}
Index: init.d/net.lo
===================================================================
--- init.d/net.lo (revision 1964)
+++ init.d/net.lo (working copy)
@@ -1086,19 +1086,6 @@
# which localises variables and unsets functions
start() {
declare -r IFACE="${SVCNAME#*.}"
- if [[ ${IN_HOTPLUG} == "1" ]] ; then
- # If we've been called by hotplug, check if we have
- # a policy for the interface for not starting
- local x ifvar="$(bash_variable "${IFACE}")"
- x="hotplug_${ifvar}"
- if [[ ${!x} == "no" || ${!x} == "false" ]] ; then
- eerror "Not starting interface ${IFACE} due to hotplug policy"
- unset -f exit
- mark_service_stopped "net.${IFACE}"
- exit 1
- fi
- fi
-
einfo "Starting ${IFACE}"
run "${IFACE}" start
}
Index: etc/conf.d/net.example
===================================================================
--- etc/conf.d/net.example (revision 1964)
+++ etc/conf.d/net.example (working copy)
@@ -21,15 +21,6 @@
# read through the rest of this file.
##############################################################################
-# DEFAULTS
-#
-# hotplug_eth0="yes"
-# Do we allow hotplug to bring up interfaces or not? The default is we do,
-# otherwise put no in the above value.
-# NOTE: hotplug just has to be installed for hotplugging to work - it does
-# not matter if it's in any runlevel or not.
-
-##############################################################################
# MODULES
#
# We now support modular networking scripts which means we can easily
@@ -361,7 +352,7 @@
#link_ppp0="/dev/ttyS0" # Most PPP links will use a serial port
#link_ppp0="eth0" # PPPoE requires an ethernet interface
#link_ppp0="/dev/null" # PPPoA and ISDN links should have this
-#link_ppp0="pty $(your_link_command)" # PPP links over ssh, rsh, etc
+#link_ppp0="pty 'your_link_command'" # PPP links over ssh, rsh, etc
#
# Here you should specify what pppd plugins you want to use
# Available plugins are: pppoe, pppoa, capi, dhcpc, minconn, radius,
Index: sbin/runscript.sh
===================================================================
--- sbin/runscript.sh (revision 1964)
+++ sbin/runscript.sh (working copy)
@@ -27,10 +27,13 @@
# until after rc sysinit has completed so we punt them to the boot runlevel
if [[ -e /dev/.rcsysinit ]] ; then
eerror "ERROR: cannot run ${SVCNAME} until sysinit completes"
- eerror "${SVCNAME} will be started in the ${BOOTLEVEL} runlevel"
- if [[ ! -L /dev/.rcboot/"${SVCNAME}" ]] ; then
- [[ ! -d /dev/.rcboot ]] && mkdir /dev/.rcboot
- ln -snf "$1" /dev/.rcboot/"${SVCNAME}"
+ if [[ ${RC_COLDPLUG} == "yes" \
+ || " ${RC_COLDPLUG} " == *" ${SVCNAME} "* ]] ; then
+ eerror "${SVCNAME} will be started in the ${BOOTLEVEL} runlevel"
+ if [[ ! -L /dev/.rcboot/"${SVCNAME}" ]] ; then
+ [[ ! -d /dev/.rcboot ]] && mkdir /dev/.rcboot
+ ln -snf "$1" /dev/.rcboot/"${SVCNAME}"
+ fi
fi
exit 1
fi
Index: sbin/rc
===================================================================
--- sbin/rc (revision 1964)
+++ sbin/rc (working copy)
@@ -164,7 +164,7 @@
CRITICAL_SERVICES="${CRITICAL_SERVICES} ${x##*/}"
done
else
- CRITICAL_SERVICES="checkroot modules checkfs localmount clock bootmisc"
+ CRITICAL_SERVICES="checkroot modules checkfs localmount clock"
fi
export CRITICAL_SERVICES
Index: lib/rcscripts/net.modules.d/ifconfig.sh
===================================================================
--- lib/rcscripts/net.modules.d/ifconfig.sh (revision 1975)
+++ lib/rcscripts/net.modules.d/ifconfig.sh (working copy)
@@ -109,7 +109,7 @@
ifconfig_is_up() {
local check="\<UP\>" addr="${2:-false}"
${addr} && check="\<inet addr:.*${check}"
- ifconfig "$1" | grep -Eq "${check}" && return 0
+ ifconfig "$1" | tr '\n' ' ' | grep -Eq "${check}" && return 0
return 1
}
|
GitWeb