diff options
| author | Colin Guthrie <colin@mageia.org> | 2011-11-04 17:10:19 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2011-11-04 17:10:19 +0000 |
| commit | 95adb629efbe3eea7996c67d894931d88a48ff7b (patch) | |
| tree | f1c2422ce97cb7fcac95d82e18a35ca9fd706e17 | |
| parent | 56455f2adfd035d056b949b117776cc9bccf7de3 (diff) | |
| download | initscripts-95adb629efbe3eea7996c67d894931d88a48ff7b.tar initscripts-95adb629efbe3eea7996c67d894931d88a48ff7b.tar.gz initscripts-95adb629efbe3eea7996c67d894931d88a48ff7b.tar.bz2 initscripts-95adb629efbe3eea7996c67d894931d88a48ff7b.tar.xz initscripts-95adb629efbe3eea7996c67d894931d88a48ff7b.zip | |
Fix some mis-merging
| -rwxr-xr-x | rc.d/rc.sysinit | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index be1985e6..46d04fe8 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -280,11 +280,12 @@ fi nashpid=$(pidof nash 2>/dev/null) [ -n "$nashpid" ] && kill $nashpid >/dev/null 2>&1 unset nashpid - +if [ "x$SPEEDBOOT" != "xyes" ]; then action $"Starting udev: " /sbin/udevd --daemon /sbin/udevadm trigger --type=subsystems --action=add /sbin/udevadm trigger --type=devices --action=add /sbin/udevadm settle +fi #SPEEDBOOT # Load other user-defined modules for file in /etc/sysconfig/modules/*.modules ; do @@ -388,7 +389,6 @@ if ! strstr "$cmdline" nodmraid && [ -x /sbin/dmraid ]; then done fi fi -fi fi #SPEEDBOOT # Start any MD RAID arrays that haven't been started yet |