# HG changeset patch # User Florian Pose # Date 1398439946 -7200 # Node ID 442634814e29dd2cd385929710e43e593e606268 # Parent a24ff468cb254a2ef8ed7ff473e1722f31c3b7c0 Avoid replacing ccat driver. diff -r a24ff468cb25 -r 442634814e29 script/ethercatctl.in --- a/script/ethercatctl.in Fri Apr 25 17:05:39 2014 +0200 +++ b/script/ethercatctl.in Fri Apr 25 17:32:26 2014 +0200 @@ -107,7 +107,7 @@ continue # ec_* module not found fi - if [ ${MODULE} != "generic" ]; then + if [ ${MODULE} != "generic" -a ${MODULE} != "ccat" ]; then # try to unload standard module if lsmod | grep "^${MODULE} " > /dev/null; then if ! ${RMMOD} ${MODULE}; then @@ -118,7 +118,7 @@ fi if ! ${MODPROBE} ${MODPROBE_FLAGS} ${ECMODULE}; then - if [ ${MODULE} != "generic" ]; then + if [ ${MODULE} != "generic" -a ${MODULE} != "ccat" ]; then ${MODPROBE} ${MODPROBE_FLAGS} ${MODULE} # try to restore fi ${RMMOD} ${LOADED_MODULES} @@ -149,7 +149,7 @@ # load standard modules again for MODULE in ${DEVICE_MODULES}; do - if [ ${MODULE} == "generic" ]; then + if [ ${MODULE} == "generic" -o ${MODULE} == "ccat" ]; then continue fi ${MODPROBE} ${MODPROBE_FLAGS} ${MODULE}