diff options
| -rw-r--r-- | meta/recipes-extended/iptables/iptables/iptables.service | 4 | ||||
| -rw-r--r-- | meta/recipes-extended/iptables/iptables_1.8.3.bb | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/meta/recipes-extended/iptables/iptables/iptables.service b/meta/recipes-extended/iptables/iptables/iptables.service index 041316e457..5a8aa3f298 100644 --- a/meta/recipes-extended/iptables/iptables/iptables.service +++ b/meta/recipes-extended/iptables/iptables/iptables.service @@ -5,8 +5,8 @@ Wants=network-pre.target [Service] Type=oneshot -ExecStart=@SBINDIR@/iptables-restore /etc/iptables/iptables.rules -ExecReload=@SBINDIR@/iptables-restore /etc/iptables/iptables.rules +ExecStart=@SBINDIR@/iptables-restore @RULESDIR@/iptables.rules +ExecReload=@SBINDIR@/iptables-restore @RULESDIR@/iptables.rules RemainAfterExit=yes [Install] diff --git a/meta/recipes-extended/iptables/iptables_1.8.3.bb b/meta/recipes-extended/iptables/iptables_1.8.3.bb index 563c8ae354..73680207b4 100644 --- a/meta/recipes-extended/iptables/iptables_1.8.3.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.3.bb @@ -38,14 +38,19 @@ do_configure_prepend() { rm -f libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 } +IPTABLES_RULES_DIR ?= "${sysconfdir}/${BPN}" + do_install_append() { - install -d ${D}${sysconfdir}/iptables - install -m 0644 ${WORKDIR}/iptables.rules ${D}${sysconfdir}/iptables + install -d ${D}${IPTABLES_RULES_DIR} + install -m 0644 ${WORKDIR}/iptables.rules ${D}${IPTABLES_RULES_DIR} install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/iptables.service ${D}${systemd_system_unitdir} - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/iptables.service + sed -i \ + -e 's,@SBINDIR@,${sbindir},g' \ + -e 's,@RULESDIR@,${IPTABLES_RULES_DIR},g' \ + ${D}${systemd_system_unitdir}/iptables.service } PACKAGES += "${PN}-modules" |