From cf71568af00d9f9ff8fa3f7d9ac86a5f7f012b68 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 2 Dec 2014 20:57:59 +0100 Subject: [PATCH] iptables: improve runit services. If the rules files don't exist just return... this way the runsvdir log is not cluttered with ENOENT messages. --- srcpkgs/iptables/files/ip6tables/run | 2 +- srcpkgs/iptables/files/iptables/run | 2 +- srcpkgs/iptables/template | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/iptables/files/ip6tables/run b/srcpkgs/iptables/files/ip6tables/run index 5f3a4741b3..2ffe0cae07 100644 --- a/srcpkgs/iptables/files/ip6tables/run +++ b/srcpkgs/iptables/files/ip6tables/run @@ -1,4 +1,4 @@ #!/bin/sh -set -e +[ ! -e /etc/iptables/ip6tables.rules ] && return 0 ip6tables-restore /etc/iptables/ip6tables.rules exec chpst -b ip6tables pause diff --git a/srcpkgs/iptables/files/iptables/run b/srcpkgs/iptables/files/iptables/run index 3643e863f6..474966060f 100644 --- a/srcpkgs/iptables/files/iptables/run +++ b/srcpkgs/iptables/files/iptables/run @@ -1,4 +1,4 @@ #!/bin/sh -set -e +[ ! -e /etc/iptables/iptables.rules ] && return 0 iptables-restore /etc/iptables/iptables.rules exec chpst -b iptables pause diff --git a/srcpkgs/iptables/template b/srcpkgs/iptables/template index ddac6d91f9..94644f4050 100644 --- a/srcpkgs/iptables/template +++ b/srcpkgs/iptables/template @@ -1,7 +1,7 @@ # Template file for 'iptables' pkgname=iptables version=1.4.21 -revision=4 +revision=5 build_style=gnu-configure build_options="systemd" configure_args="--enable-libipq --enable-shared --enable-devel --enable-bpf-compiler" @@ -24,7 +24,6 @@ fi pre_build() { rm include/linux/types.h } - post_install() { # systemd services. if [ "$build_option_systemd" ]; then