# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1203678289 0
# Node ID 80c3d9c8292f7b4a6ca4a9d76161f7a379296aec
# Parent  741cabf0fff6e6553cca2a59f1d7ef198a7bb1ea
Added MODPROBE_FLAGS variable.

diff -r 741cabf0fff6 -r 80c3d9c8292f NEWS
--- a/NEWS	Thu Feb 21 20:30:22 2008 +0000
+++ b/NEWS	Fri Feb 22 11:04:49 2008 +0000
@@ -46,6 +46,9 @@
 * Allow gaps in PDO mapping read from CoE.
 * Fixed bug in CoE code.
 * Improved handling of large EEPROM contents.
+* Renamed ec_master module parameters main and backup to main_devices and
+  backup_devices to avoid warnings of some compilers.
+* Added MODPROBE_FLAGS variable in start script and sysconfig file.
 
 -------------------------------------------------------------------------------
 
diff -r 741cabf0fff6 -r 80c3d9c8292f script/init.d/ethercat
--- a/script/init.d/ethercat	Thu Feb 21 20:30:22 2008 +0000
+++ b/script/init.d/ethercat	Fri Feb 22 11:04:49 2008 +0000
@@ -175,7 +175,8 @@
     done
 
     # load master module
-    if ! ${MODPROBE} ec_master main_devices=${DEVICES} backup_devices=${BACKUPS}; then
+    if ! ${MODPROBE} ${MODPROBE_FLAGS} ec_master \
+            main_devices=${DEVICES} backup_devices=${BACKUPS}; then
         exit_fail
     fi
 
@@ -199,8 +200,8 @@
                 exit_fail
             fi
         fi
-        if ! ${MODPROBE} ${ECMODULE}; then
-            ${MODPROBE} ${MODULE} # try to restore module
+        if ! ${MODPROBE} ${MODPROBE_FLAGS} ${ECMODULE}; then
+            ${MODPROBE} ${MODPROBE_FLAGS} ${MODULE} # try to restore module
             exit_fail
         fi
     done
@@ -229,7 +230,7 @@
 
     # reload previous modules
     for MODULE in ${DEVICE_MODULES}; do
-        if ! ${MODPROBE} ${MODULE}; then
+        if ! ${MODPROBE} ${MODPROBE_FLAGS} ${MODULE}; then
             echo Warning: Failed to restore ${MODULE}.
         fi
     done
diff -r 741cabf0fff6 -r 80c3d9c8292f script/sysconfig/ethercat
--- a/script/sysconfig/ethercat	Thu Feb 21 20:30:22 2008 +0000
+++ b/script/sysconfig/ethercat	Fri Feb 22 11:04:49 2008 +0000
@@ -46,4 +46,12 @@
 # 
 DEVICE_MODULES=""
 
+#
+# Flags for loading kernel modules.
+#
+# This can usually be left empty. Adjust this variable, if you have problems
+# with module loading.
+# 
+#MODPROBE_FLAGS="-b"
+
 #------------------------------------------------------------------------------