bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed problems with shell quotes introduced in 66329e1f.

This commit is contained in:
Florian Pose 2021-07-22 15:06:17 +02:00
parent d479f28ccc
commit 9384cc7010
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
script/ethercatctl.in
View File

@ -95,7 +95,7 @@ start)
done
# load master module
if ! ${MODPROBE} "${MODPROBE_FLAGS}" ec_master \
if ! ${MODPROBE} ${MODPROBE_FLAGS} ec_master \
main_devices="${DEVICES}" backup_devices="${BACKUPS}"; then
exit 1
fi
@ -119,11 +119,11 @@ start)
fi
fi
if ! ${MODPROBE} "${MODPROBE_FLAGS}" "${ECMODULE}"; then
if ! ${MODPROBE} ${MODPROBE_FLAGS} "${ECMODULE}"; then
if [ "${MODULE}" != "generic" ] && [ "${MODULE}" != "ccat" ]; then
${MODPROBE} "${MODPROBE_FLAGS}" "${MODULE}" # try to restore
${MODPROBE} ${MODPROBE_FLAGS} "${MODULE}" # try to restore
fi
${RMMOD} "${LOADED_MODULES}"
${RMMOD} ${LOADED_MODULES}
exit 1
fi
@ -154,7 +154,7 @@ stop)
if [ "${MODULE}" == "generic" ] || [ "${MODULE}" == "ccat" ]; then
continue
fi
${MODPROBE} "${MODPROBE_FLAGS}" "${MODULE}"
${MODPROBE} ${MODPROBE_FLAGS} "${MODULE}"
done
exit 0

8
script/init.d/ethercat.in
View File

@ -166,7 +166,7 @@ start)
done
# load master module
if ! ${MODPROBE} "${MODPROBE_FLAGS}" ec_master "${MASTER_ARGS}" \
if ! ${MODPROBE} ${MODPROBE_FLAGS} ec_master "${MASTER_ARGS}" \
main_devices="${DEVICES}" backup_devices="${BACKUPS}"; then
exit_fail
fi
@ -184,9 +184,9 @@ start)
fi
fi
fi
if ! ${MODPROBE} "${MODPROBE_FLAGS}" "${ECMODULE}"; then
if ! ${MODPROBE} ${MODPROBE_FLAGS} "${ECMODULE}"; then
if [ "${MODULE}" != "generic" ]; then
${MODPROBE} "${MODPROBE_FLAGS}" "${MODULE}" # try to restore
${MODPROBE} ${MODPROBE_FLAGS} "${MODULE}" # try to restore
fi
exit_fail
fi
@ -214,7 +214,7 @@ stop)
# reload previous modules
for MODULE in ${DEVICE_MODULES}; do
if [ "${MODULE}" != "generic" ]; then
if ! ${MODPROBE} "${MODPROBE_FLAGS}" "${MODULE}"; then
if ! ${MODPROBE} ${MODPROBE_FLAGS} "${MODULE}"; then
echo Warning: Failed to restore "${MODULE}".
fi
fi