]>
Commit | Line | Data |
---|---|---|
1 | Index: branches/baselayout-1_12/sbin/rc | |
2 | =================================================================== | |
3 | --- branches/baselayout-1_12/sbin/rc (revision 2250) | |
4 | +++ branches/baselayout-1_12/sbin/rc (working copy) | |
5 | @@ -288,9 +288,9 @@ then | |
6 | esac | |
7 | ||
8 | # Check udev prerequisites and kernel params | |
9 | - if [ "${udev}" = "yes" ] && has_addon udev | |
10 | + if [ "${udev}" = "yes" ] | |
11 | then | |
12 | - if get_bootparam "noudev" || \ | |
13 | + if get_bootparam "noudev" || ! has_addon udev || \ | |
14 | [ ${devfs_automounted} = "yes" ] || \ | |
15 | [ "$(get_KV)" -lt "$(KV_to_int '2.6.0')" ] | |
16 | then | |
17 | @@ -299,9 +299,10 @@ then | |
18 | fi | |
19 | ||
20 | # Check devfs prerequisites and kernel params | |
21 | - if [ "${devfs}" = "yes" ] && has_addon devfs | |
22 | + if [ "${devfs}" = "yes" ] | |
23 | then | |
24 | - if get_bootparam "nodevfs" || [ "${udev}" = "yes" ] | |
25 | + if get_bootparam "nodevfs" || [ "${udev}" = "yes" ] || \ | |
26 | + ! has_addon devfs | |
27 | then | |
28 | devfs="no" | |
29 | fi |