projects
/
grml-terminalserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release new version 0.105.0
[grml-terminalserver.git]
/
grml-terminalserver
diff --git
a/grml-terminalserver
b/grml-terminalserver
index
3e7a6aa
..
1314205
100755
(executable)
--- a/
grml-terminalserver
+++ b/
grml-terminalserver
@@
-38,8
+38,8
@@
function printUsage
cat <<EOT
Usage: "$PROG_NAME__" [OPTIONS] <command>
cat <<EOT
Usage: "$PROG_NAME__" [OPTIONS] <command>
-$PROG_NAME__ is the config program for the terminalserver
-
comming with g
rml.
+$PROG_NAME__ is the config
uration
program for the terminalserver
+
provided by G
rml.
COMMANDS:
help This help text
COMMANDS:
help This help text
@@
-154,7
+154,7
@@
function runIptables
function startIptables
{
function startIptables
{
- if [ -x
/sbin/iptables
] ; then
+ if [ -x
$(command -v iptables)
] ; then
if [[ $NAT_INTERFACE_ != "" ]]; then
local nat_source_ip_=`netGetIp "$NAT_INTERFACE_" warn`
if [[ $NAT_INTERFACE_ != "" ]]; then
local nat_source_ip_=`netGetIp "$NAT_INTERFACE_" warn`
@@
-176,7
+176,7
@@
function startIptables
fi
fi
else
fi
fi
else
- warn "iptables executable not avilable"
+ warn "iptables executable not av
a
ilable"
fi
}
fi
}
@@
-185,7
+185,7
@@
function stopIptables
if [[ $IPTABLES_SNAT_ != "true" ]]; then
return
fi
if [[ $IPTABLES_SNAT_ != "true" ]]; then
return
fi
- if [ -x
/sbin/iptables
] ; then
+ if [ -x
$(command -v iptables)
] ; then
if [[ $NAT_INTERFACE_ != "" ]]; then
local nat_source_ip_=`netGetIp "$NAT_INTERFACE_" warn`
if [[ $NAT_INTERFACE_ != "" ]]; then
local nat_source_ip_=`netGetIp "$NAT_INTERFACE_" warn`
@@
-230,7
+230,7
@@
function createTftpConf
function stopTftp
{
function stopTftp
{
- start-stop-daemon --stop --quiet -p "$TFTPD_PID_"
+ start-stop-daemon --stop --quiet -p "$TFTPD_PID_"
--user nobody
}
function startTftp
{
}
function startTftp
{
@@
-438,7
+438,7
@@
if [ "$1" == 'start' ]; then
esac
fi
if [ $check_necessary_files_ == 'yes' ]; then
esac
fi
if [ $check_necessary_files_ == 'yes' ]; then
- # test for files absolutly necessary for grml-terminalserver and created from -config
+ # test for files absolut
e
ly necessary for grml-terminalserver and created from -config
problem_=0
for i in $PATH_/initrd.img; do
isExistent $i warn || problem_=1
problem_=0
for i in $PATH_/initrd.img; do
isExistent $i warn || problem_=1