|
@@ -37,18 +37,24 @@ has_parent_process(){
|
|
|
then
|
|
then
|
|
|
echo ${parent_to_search}
|
|
echo ${parent_to_search}
|
|
|
return 0
|
|
return 0
|
|
|
- else if [ $pid > 1 ]
|
|
|
|
|
|
|
+ else if [ $pid -gt 1 ]
|
|
|
then
|
|
then
|
|
|
- ppid=$(ps --pid ${pid} -o ppid= | xargs)
|
|
|
|
|
- if [ $ppid = $pid ]
|
|
|
|
|
|
|
+ ppid=$(ps --pid ${pid} -o ppid= | xargs) || echo "OUT OF RANGE PID=${pid}" >&2
|
|
|
|
|
+ if [ -n "$ppid" ]
|
|
|
then
|
|
then
|
|
|
- echo "ERROR: pid=$pid is the same as ppid=$ppid" >&2
|
|
|
|
|
- echo -1
|
|
|
|
|
|
|
+ if [ $ppid = $pid ]
|
|
|
|
|
+ then
|
|
|
|
|
+ #echo "ERROR: pid=$pid is the same as ppid=$ppid" >&2
|
|
|
|
|
+ echo -1
|
|
|
|
|
+ else
|
|
|
|
|
+ has_parent_process ${parent_to_search} ${ppid}
|
|
|
|
|
+ fi
|
|
|
else
|
|
else
|
|
|
- has_parent_process ${parent_to_search} ${ppid}
|
|
|
|
|
|
|
+ #echo "ERROR: pid='$pid' has ppid='$ppid'" >&2
|
|
|
|
|
+ echo -2
|
|
|
fi
|
|
fi
|
|
|
else
|
|
else
|
|
|
- echo "NOT FOUND: ${parent_to_search}" >&2
|
|
|
|
|
|
|
+ #echo "NOT FOUND: ${parent_to_search}" >&2
|
|
|
echo 1
|
|
echo 1
|
|
|
fi
|
|
fi
|
|
|
fi
|
|
fi
|
|
@@ -66,7 +72,7 @@ find_systemctl_pids(){
|
|
|
local systemctl_pid
|
|
local systemctl_pid
|
|
|
ps -elf | grep 'systemctl' | grep -v grep | awk '{print $13}' | sort -u | while read term
|
|
ps -elf | grep 'systemctl' | grep -v grep | awk '{print $13}' | sort -u | while read term
|
|
|
do
|
|
do
|
|
|
- echo ${shell_pid} ${systemctl_pid} >&2
|
|
|
|
|
|
|
+ #echo ${shell_pid} ${systemctl_pid} >&2
|
|
|
if [ -z "${shell_pid:-}" ]
|
|
if [ -z "${shell_pid:-}" ]
|
|
|
then
|
|
then
|
|
|
shell_pid=$(find_pid_user_of /dev/$term '.*sh$')
|
|
shell_pid=$(find_pid_user_of /dev/$term '.*sh$')
|
|
@@ -241,7 +247,7 @@ fi
|
|
|
|
|
|
|
|
# Should I disable this ?
|
|
# Should I disable this ?
|
|
|
# I think I should... but will the
|
|
# I think I should... but will the
|
|
|
-if ! ip link show $NETWORK_IF > /dev/null 2>&1
|
|
|
|
|
|
|
+if ! /usr/bin/ip link show $NETWORK_IF > /dev/null 2>&1
|
|
|
then
|
|
then
|
|
|
echo "Network interface '$NETWORK_IF' is not present" >&2
|
|
echo "Network interface '$NETWORK_IF' is not present" >&2
|
|
|
exit 2
|
|
exit 2
|
|
@@ -744,7 +750,7 @@ case "$1" in
|
|
|
echo "Droping all connections !!!"
|
|
echo "Droping all connections !!!"
|
|
|
fw_dropall
|
|
fw_dropall
|
|
|
echo "done."
|
|
echo "done."
|
|
|
- if [ -c "${parent_term}" ]
|
|
|
|
|
|
|
+ if [ -c "${parent_term:-}" ]
|
|
|
then
|
|
then
|
|
|
exec 2>${parent_term}
|
|
exec 2>${parent_term}
|
|
|
fi
|
|
fi
|