diff --git a/NEWS b/NEWS index b89943e2..5a3e3ef6 100644 --- a/NEWS +++ b/NEWS @@ -46,6 +46,9 @@ Changes in version 1.4.0: * 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 --git a/script/init.d/ethercat b/script/init.d/ethercat index 88cf1be7..6cb752e5 100755 --- a/script/init.d/ethercat +++ b/script/init.d/ethercat @@ -175,7 +175,8 @@ start) 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 @@ start) 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 @@ stop) # 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 --git a/script/sysconfig/ethercat b/script/sysconfig/ethercat index 2ab96292..f4656c5c 100644 --- a/script/sysconfig/ethercat +++ b/script/sysconfig/ethercat @@ -46,4 +46,12 @@ MASTER0_BACKUP="" # 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" + #------------------------------------------------------------------------------