Prevent direct call to minifirewall script in favor of systemctl or /etc/init.d/minifirewall stub
This commit is contained in:
parent
a8b604a900
commit
1f9002f4f3
8
init.sh
8
init.sh
|
@ -22,16 +22,16 @@ fi
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
start)
|
start)
|
||||||
${minifirewall_bin} start
|
systemctl start minifirewall
|
||||||
;;
|
;;
|
||||||
stop)
|
stop)
|
||||||
${minifirewall_bin} stop
|
systemctl stop minifirewall
|
||||||
;;
|
;;
|
||||||
status)
|
status)
|
||||||
${minifirewall_bin} status
|
systemctl status minifirewall
|
||||||
;;
|
;;
|
||||||
restart|reload|condrestart)
|
restart|reload|condrestart)
|
||||||
${minifirewall_bin} restart
|
systemctl restart minifirewall
|
||||||
;;
|
;;
|
||||||
reset)
|
reset)
|
||||||
${minifirewall_bin} reset
|
${minifirewall_bin} reset
|
||||||
|
|
19
minifirewall
19
minifirewall
|
@ -27,11 +27,12 @@ show_help() {
|
||||||
cat <<END
|
cat <<END
|
||||||
minifirewall is wrapper around netfilter/iptables for easy local firewalling on Linux.
|
minifirewall is wrapper around netfilter/iptables for easy local firewalling on Linux.
|
||||||
|
|
||||||
Usage: minifirewall start
|
Usage: systemctl start minifirewall
|
||||||
or minifirewall stop
|
or systemctl stop minifirewall
|
||||||
or minifirewall restart
|
or systemctl restart minifirewall
|
||||||
or minifirewall reset
|
or systemctl status minifirewall
|
||||||
or minifirewall status
|
or minifirewall status
|
||||||
|
or minifirewall reset
|
||||||
or minifirewall {version|--version|-V}
|
or minifirewall {version|--version|-V}
|
||||||
or minifirewall {help|--help|-h|-?}
|
or minifirewall {help|--help|-h|-?}
|
||||||
END
|
END
|
||||||
|
@ -149,6 +150,13 @@ source_includes() {
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
exit_if_not_systemd() {
|
||||||
|
if [ $PPID -ne 1 ]; then
|
||||||
|
echo "Error: Please use minifirewall systemd service instead of direct call." 1>&2
|
||||||
|
show_help
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
check_unpersisted_state() {
|
check_unpersisted_state() {
|
||||||
cmp_bin=$(command -v cmp)
|
cmp_bin=$(command -v cmp)
|
||||||
diff_bin=$(command -v diff)
|
diff_bin=$(command -v diff)
|
||||||
|
@ -930,6 +938,7 @@ reset() {
|
||||||
main() {
|
main() {
|
||||||
case "${1:-''}" in
|
case "${1:-''}" in
|
||||||
start)
|
start)
|
||||||
|
exit_if_not_systemd
|
||||||
source_configuration
|
source_configuration
|
||||||
check_unpersisted_state
|
check_unpersisted_state
|
||||||
|
|
||||||
|
@ -937,6 +946,7 @@ main() {
|
||||||
;;
|
;;
|
||||||
|
|
||||||
stop)
|
stop)
|
||||||
|
exit_if_not_systemd
|
||||||
source_configuration
|
source_configuration
|
||||||
check_unpersisted_state
|
check_unpersisted_state
|
||||||
|
|
||||||
|
@ -958,6 +968,7 @@ main() {
|
||||||
;;
|
;;
|
||||||
|
|
||||||
restart)
|
restart)
|
||||||
|
exit_if_not_systemd
|
||||||
source_configuration
|
source_configuration
|
||||||
check_unpersisted_state
|
check_unpersisted_state
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue