summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--[-rwxr-xr-x]meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save2
-rw-r--r--meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb6
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save
index 2d7fc4ed7c..2133600f77 100755..100644
--- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save
+++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2 2
3EBTABLES="/sbin/ebtables" 3EBTABLES="/usr/sbin/ebtables-legacy"
4 4
5[ -x "$EBTABLES" ] || exit 1 5[ -x "$EBTABLES" ] || exit 1
6 6
diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
index 08d4d661d8..be21c372d9 100644
--- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
+++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
@@ -28,11 +28,11 @@ do_install_append () {
28 #This file has been provided by netbase 28 #This file has been provided by netbase
29 rm -f ${D}${sysconfdir}/ethertypes 29 rm -f ${D}${sysconfdir}/ethertypes
30 30
31 install -d ${D}${base_sbindir}
32 # Replace upstream ebtables-save perl script with Fedora bash based rewrite 31 # Replace upstream ebtables-save perl script with Fedora bash based rewrite
33 # http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save 32 # http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save
34 install -m 0755 ${WORKDIR}/ebtables-legacy-save ${D}${base_sbindir}/ebtables-legacy-save 33 rm -f ${D}${sbindir}/ebtables-legacy-save
35 sed -i 's!/sbin/!${base_sbindir}/!g' ${D}${base_sbindir}/ebtables-legacy-save 34 install -m 0755 ${WORKDIR}/ebtables-legacy-save ${D}${sbindir}/ebtables-legacy-save
35
36 # Install systemd service files 36 # Install systemd service files
37 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 37 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
38 install -d ${D}${systemd_unitdir}/system 38 install -d ${D}${systemd_unitdir}/system