rpms/iptables
6
0
Fork 0
Code Issues Pull Requests Releases Activity

iptables.init: make sure the subsys directory exists (RHBZ#1159573)

Browse Source 
Also use /run/lock/subsys/ instead of /var/lock/subsys/
to be consistent with /usr/lib/tmpfiles.d/legacy.conf
This commit is contained in:
Jiri Popelka 2014-11-03 14:22:49 +01:00
parent edc59df70f
commit 2962b798c0
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
iptables.init
View File

@ -27,7 +27,8 @@ IPTABLES_CONFIG=/etc/sysconfig/${IPTABLES}-config
IPV=${IPTABLES%tables} # ip for ipv4 | ip6 for ipv6 IPV=${IPTABLES%tables} # ip for ipv4 | ip6 for ipv6
[ "$IPV" = "ip" ] && _IPV="ipv4" || _IPV="ipv6" [ "$IPV" = "ip" ] && _IPV="ipv4" || _IPV="ipv6"
PROC_IPTABLES_NAMES=/proc/net/${IPV}_tables_names PROC_IPTABLES_NAMES=/proc/net/${IPV}_tables_names
VAR_SUBSYS_IPTABLES=/var/lock/subsys/$IPTABLES RUN_SUBSYS=/run/lock/subsys
RUN_SUBSYS_IPTABLES=${RUN_SUBSYS}/${IPTABLES}
if [ ! -x /sbin/$IPTABLES ]; then if [ ! -x /sbin/$IPTABLES ]; then
echo -n $"${IPTABLES}: /sbin/$IPTABLES does not exist."; warning; echo echo -n $"${IPTABLES}: /sbin/$IPTABLES does not exist."; warning; echo
@ -209,7 +210,8 @@ start() {
echo echo
fi fi
touch $VAR_SUBSYS_IPTABLES mkdir -p $RUN_SUBSYS
touch $RUN_SUBSYS_IPTABLES
return $ret return $ret
} }
@ -241,7 +243,7 @@ stop() {
echo echo
fi fi
rm -f $VAR_SUBSYS_IPTABLES rm -f $RUN_SUBSYS_IPTABLES
return $ret return $ret
} }
@ -282,7 +284,7 @@ save() {
} }
status() { status() {
if [ ! -f "$VAR_SUBSYS_IPTABLES" -a -z "$NF_TABLES" ]; then if [ ! -f "$RUN_SUBSYS_IPTABLES" -a -z "$NF_TABLES" ]; then
echo $"${IPTABLES}: Firewall is not running." echo $"${IPTABLES}: Firewall is not running."
return 3 return 3
fi fi
@ -325,7 +327,7 @@ restart() {
case "$1" in case "$1" in
start) start)
[ -f "$VAR_SUBSYS_IPTABLES" ] && exit 0 [ -f "$RUN_SUBSYS_IPTABLES" ] && exit 0
start start
RETVAL=$? RETVAL=$?
;; ;;
@ -339,7 +341,7 @@ case "$1" in
RETVAL=$? RETVAL=$?
;; ;;
condrestart|try-restart) condrestart|try-restart)
[ ! -e "$VAR_SUBSYS_IPTABLES" ] && exit 0 [ ! -e "$RUN_SUBSYS_IPTABLES" ] && exit 0
restart restart
RETVAL=$? RETVAL=$?
;; ;;

5
iptables.spec
View File

@ -7,7 +7,7 @@
Name: iptables Name: iptables
Summary: Tools for managing Linux kernel packet filtering capabilities Summary: Tools for managing Linux kernel packet filtering capabilities
Version: 1.4.21 Version: 1.4.21
Release: 12%{?dist} Release: 13%{?dist}
Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
Source1: iptables.init Source1: iptables.init
Source2: iptables-config Source2: iptables-config
@ -221,6 +221,9 @@ done
%changelog %changelog
* Mon Nov 03 2014 Jiri Popelka <jpopelka@redhat.com> - 1.4.21-13
- iptables.init: use /run/lock/subsys/ instead of /var/lock/subsys/ (RHBZ#1159573)
* Mon Sep 29 2014 Jiri Popelka <jpopelka@redhat.com> - 1.4.21-12 * Mon Sep 29 2014 Jiri Popelka <jpopelka@redhat.com> - 1.4.21-12
- ip[6]tables.init: change shebang from /bin/sh to /bin/bash (RHBZ#1147272) - ip[6]tables.init: change shebang from /bin/sh to /bin/bash (RHBZ#1147272)