ebtables: add missing file ebtables.common
PATCH 1/3 ebtables: add missing file ebtables.common
The ebtables.common is required by ebtables.service. Add it back.
Fixes:
systemd[660]: ebtables.service: Failed to locate executable /usr/sbin/ebtables.common: No such file or directory systemd[660]: ebtables.service: Failed at step EXEC spawning /usr/sbin/ebtables.common: No such file or directory
--- .../ebtables/ebtables-2.0.11/ebtables.common | 163 ++++++++++++++++++ .../ebtables/ebtables_2.0.11.bb | 10 +- 2 files changed, 170 insertions(+), 3 deletions(-) create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables.common
meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables.common new file +163 -0
@@ -0,0 +1,163 @@ +#!/bin/sh + +[ -x /usr/sbin/ebtables-legacy ] || exit 1 + +EBTABLES_DUMPFILE_STEM=/etc/ebtables/dump + +RETVAL=0 +prog="ebtables" +desc="Ethernet bridge filtering" +umask 0077 + +#default configuration +EBTABLES_MODULES_UNLOAD="yes" +EBTABLES_LOAD_ON_START="no" +EBTABLES_SAVE_ON_STOP="no" +EBTABLES_SAVE_ON_RESTART="no" +EBTABLES_SAVE_COUNTER="no" +EBTABLES_BACKUP_SUFFIX="~" + +config=/etc/default/$prog +[ -f "$config" ] && . "$config" + +get_supported_tables() { + EBTABLES_SUPPORTED_TABLES= + /usr/sbin/ebtables-legacy -t filter -L 2>&1 1>/dev/null | grep -q permission + if [ $? -eq 0 ]; then + echo "Error: insufficient privileges to access the ebtables rulesets." + exit 1 + fi + for table in filter nat broute; do + /usr/sbin/ebtables-legacy -t $table -L &> /dev/null + if [ $? -eq 0 ]; then + EBTABLES_SUPPORTED_TABLES="${EBTABLES_SUPPORTED_TABLES} $table" + fi + done +} + +load() { + RETVAL=0 + get_supported_tables + echo -n "Restoring ebtables rulesets: " + for table in $EBTABLES_SUPPORTED_TABLES; do + echo -n "$table " + if [ -s ${EBTABLES_DUMPFILE_STEM}.$table ]; then + /usr/sbin/ebtables-legacy -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-commit + RET=$? + if [ $RET -ne 0 ]; then + echo -n "(failed) " + RETVAL=$RET + fi + else + echo -n "(no saved state) " + fi + done + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo -n "no kernel support. " + else + echo -n "done. " + fi + if [ $RETVAL -eq 0 ]; then + echo "ok" + else + echo "fail" + fi +} + +clear_rules() { + RETVAL=0 + get_supported_tables + echo -n "Clearing ebtables rulesets: " + for table in $EBTABLES_SUPPORTED_TABLES; do + echo -n "$table " + /usr/sbin/ebtables-legacy -t $table --init-table + done + + if [ "$EBTABLES_MODULES_UNLOAD" = "yes" ]; then + for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -d' ' -f1) ebtables; do + rmmod $mod 2> /dev/null + done + fi + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo -n "no kernel support. " + else + echo -n "done. " + fi + if [ $RETVAL -eq 0 ]; then + echo "ok" + else + echo "fail" + fi +} + +save() { + RETVAL=0 + get_supported_tables + echo -n "Saving ebtables rulesets: " + for table in $EBTABLES_SUPPORTED_TABLES; do + echo -n "$table " + [ -n "$EBTABLES_BACKUP_SUFFIX" ] && [ -s ${EBTABLES_DUMPFILE_STEM}.$table ] && \ + mv ${EBTABLES_DUMPFILE_STEM}.$table ${EBTABLES_DUMPFILE_STEM}.$table$EBTABLES_BACKUP_SUFFIX + /usr/sbin/ebtables-legacy -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-save + RET=$? + if [ $RET -ne 0 ]; then + echo -n "(failed) " + RETVAL=$RET + else + if [ "$EBTABLES_SAVE_COUNTER" = "no" ]; then + /usr/sbin/ebtables-legacy -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table -Z + fi + fi + done + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo -n "no kernel support. " + else + echo -n "done. " + fi + if [ $RETVAL -eq 0 ]; then + echo "ok" + else + echo "fail" + fi +} + +case "$1" in + start) + [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load + ;; + stop) + [ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save + clear_rules + ;; + restart|reload|force-reload) + [ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save + clear_rules + [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load + ;; + load) + load + ;; + save) + save + ;; + status) + get_supported_tables + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo "No kernel support for ebtables." + RETVAL=1 + else + echo -n "Ebtables support available, number of installed rules: " + for table in $EBTABLES_SUPPORTED_TABLES; do + COUNT=$(( $(/usr/sbin/ebtables-legacy -t $table -L | sed -e "/^Bridge chain/! d" -e "s/^.*entries: //" -e "s/,.*$/ +/") 0 )) + echo -n "$table($COUNT) " + done + echo ok + RETVAL=0 + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|force-reload|load|save|status}" >&2 + RETVAL=1 +esac + +exit $RETVAL
meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb +7 -3
@@ -13,6 +13,7 @@ RRECOMMENDS_${PN} += "kernel-module-ebtables \ SRC_URI = "http://ftp.netfilter.org/pub/ebtables/ebtables-${PV}.tar.gz \ file://ebtables-legacy-save \ + file://ebtables.common \ file://ebtables.service \ "
@@ -33,9 +34,12 @@ do_install_append () { install -m 0755 ${WORKDIR}/ebtables-legacy-save ${D}${base_sbindir}/ebtables-legacy-save sed -i 's!/sbin/!${base_sbindir}/!g' ${D}${base_sbindir}/ebtables-legacy-save # Install systemd service files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/ebtables.service ${D}${systemd_unitdir}/system - sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/ebtables.service + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/ebtables.service ${D}${systemd_unitdir}/system + sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/ebtables.service + install -m 0755 ${WORKDIR}/ebtables.common ${D}${sbindir}/ebtables.common + fi } do_configure_prepend () {
Signature · 1 line
2.25.1
PATCH 2/3 etbales: remove upstream ebtables-legacy-save
Remove the upstream ebtables-legacy-save before we install the local ones. And install it to ${sbindir} rather than ${base_sbindir}.
--- .../ebtables/ebtables-2.0.11/ebtables-legacy-save | 2 +- meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) mode change 100755 => 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save
meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save +1 -1
@@ -1,6 +1,6 @@ #!/bin/bash -EBTABLES="/sbin/ebtables" +EBTABLES="/usr/sbin/ebtables-legacy" [ -x "$EBTABLES" ] || exit 1
meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb +3 -3
@@ -28,11 +28,11 @@ do_install_append () { #This file has been provided by netbase rm -f ${D}${sysconfdir}/ethertypes - install -d ${D}${base_sbindir} # Replace upstream ebtables-save perl script with Fedora bash based rewrite # http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save - install -m 0755 ${WORKDIR}/ebtables-legacy-save ${D}${base_sbindir}/ebtables-legacy-save - sed -i 's!/sbin/!${base_sbindir}/!g' ${D}${base_sbindir}/ebtables-legacy-save + rm -f ${D}${sbindir}/ebtables-legacy-save + install -m 0755 ${WORKDIR}/ebtables-legacy-save ${D}${sbindir}/ebtables-legacy-save + # Install systemd service files if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system
Signature · 1 line
2.25.1
Re: [oe] [meta-networking][PATCH 2/3] etbales: remove upstream ebtables-legacy-save
Hi,
Fix typo in commit message:
-[oe] [meta-networking][PATCH 2/3] etbales: remove upstream ebtables-legacy-save
+[oe] [meta-networking][PATCH 2/3] ebtables: remove upstream ebtables-legacy-save
Yi Zhao <[email protected]> escreveu no dia quinta, 31/12/2020 à(s) 09:03:
Quoted 62 lines
Remove the upstream ebtables-legacy-save before we install the local ones. And install it to ${sbindir} rather than ${base_sbindir}.
Signed-off-by Yi Zhao <[email protected]>--- .../ebtables/ebtables-2.0.11/ebtables-legacy-save | 2 +- meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) mode change 100755 => 100644meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save
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 old mode 100755
new mode 100644
index2d7fc4ed7..2133600f7
---
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-savemeta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save +1
-1@@ -1,6 +1,6 @@ #!/bin/bash -EBTABLES="/sbin/ebtables" +EBTABLES="/usr/sbin/ebtables-legacy" [ -x "$EBTABLES" ] || exit 1meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb +0
-1@@ -28,11 +28,11 @@ do_install_append () { #This file has been provided by netbase rm -f ${D}${sysconfdir}/ethertypes - install -d ${D}${base_sbindir} # Replace upstream ebtables-save perl script with Fedora bashbased rewrite
#http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save
- install -m 0755 ${WORKDIR}/ebtables-legacy-save
${D}${base_sbindir}/ebtables-legacy-save
- sed -i 's!/sbin/!${base_sbindir}/!g'
${D}${base_sbindir}/ebtables-legacy-savemeta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb +2
-0+ rm -f ${D}${sbindir}/ebtables-legacy-save + install -m 0755 ${WORKDIR}/ebtables-legacy-save${D}${sbindir}/ebtables-legacy-save
+
# Install systemd service files
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true',
'false', d)}; theninstall -d ${D}${systemd_unitdir}/system--
2.25.1
Signature · 2 lines
best regards, José Quaresma
Re: [oe] [meta-networking][PATCH 2/3] etbales: remove upstream ebtables-legacy-save
Quoted 8 lines · Jose Quaresma
Hi,
Fix typo in commit message:
-[oe] [meta-networking][PATCH 2/3] etbales: remove upstream ebtables-legacy-save
+[oe] [meta-networking][PATCH 2/3] ebtables: remove upstream ebtables-legacy-save
I gave edited in master-next
Quoted 82 lines
Yi Zhao <[email protected] <mailto:[email protected]>> escreveu no dia quinta, 31/12/2020 à(s) 09:03:
Remove the upstream ebtables-legacy-save before we install the local ones. And install it to ${sbindir} rather than ${base_sbindir}. Signed-off-by: Yi Zhao <[email protected] <mailto:[email protected]>> --- .../ebtables/ebtables-2.0.11/ebtables-legacy-save | 2 +- meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb <http://ebtables_2.0.11.bb> | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) mode change 100755 => 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save 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 old mode 100755 new mode 100644 index 2d7fc4ed7..2133600f7 --- 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 @@ #!/bin/bash -EBTABLES="/sbin/ebtables" +EBTABLES="/usr/sbin/ebtables-legacy" [ -x "$EBTABLES" ] || exit 1 diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb <http://ebtables_2.0.11.bb> b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb <http://ebtables_2.0.11.bb> index 08d4d661d..be21c372d 100644 --- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb <http://ebtables_2.0.11.bb> +++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb <http://ebtables_2.0.11.bb> @@ -28,11 +28,11 @@ do_install_append () { #This file has been provided by netbase rm -f ${D}${sysconfdir}/ethertypes - install -d ${D}${base_sbindir} # Replace upstream ebtables-save perl script with Fedora bash based rewrite # http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save <http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save> - install -m 0755 ${WORKDIR}/ebtables-legacy-save ${D}${base_sbindir}/ebtables-legacy-save - sed -i 's!/sbin/!${base_sbindir}/!g' ${D}${base_sbindir}/ebtables-legacy-save + rm -f ${D}${sbindir}/ebtables-legacy-save + install -m 0755 ${WORKDIR}/ebtables-legacy-save ${D}${sbindir}/ebtables-legacy-save + # Install systemd service files if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system -- 2.25.1Signature · 2 lines
best regards, José Quaresma
Re: [oe] [meta-networking][PATCH 2/3] etbales: remove upstream ebtables-legacy-save
Quoted 5 lines · Khem Raj
Quoted 2 lines · Jose Quaresma
Hi,
Quoted 8 lines
Quoted 6 lines
Fix typo in commit message:
-[oe] [meta-networking][PATCH 2/3] etbales: remove upstream ebtables-legacy-save
+[oe] [meta-networking][PATCH 2/3] ebtables: remove upstream ebtables-legacy-saveI gave edited in master-next
Thanks, Jose and Khem.
//Yi
Quoted 82 lines
Quoted 82 lines
Yi Zhao <[email protected] <mailto:[email protected]>> escreveu no dia quinta, 31/12/2020 à(s) 09:03:
Remove the upstream ebtables-legacy-save before we install the local ones. And install it to ${sbindir} rather than ${base_sbindir}.
Signed-off-by Yi Zhao <[email protected]<mailto:[email protected]>>
---
.../ebtables/ebtables-2.0.11/ebtables-legacy-save | 2 +- meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
<http://ebtables_2.0.11.bb> | 6 +++---2 files changed, 4 insertions(+), 4 deletions(-)mode change 100755 => 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save
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 old mode 100755
new mode 100644
index2d7fc4ed7..2133600f7
---
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 @@
#!/bin/bash-EBTABLES="/sbin/ebtables"
+EBTABLES="/usr/sbin/ebtables-legacy"[ -x "$EBTABLES" ] || exit 1
diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
<http://ebtables_2.0.11.bb>
b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
<http://ebtables_2.0.11.bb>
index08d4d661d..be21c372d100644
--- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
<http://ebtables_2.0.11.bb>
+++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
<http://ebtables_2.0.11.bb>
@@ -28,11 +28,11 @@do_install_append() {
#This file has been provided by netbase
rm -f ${D}${sysconfdir}/ethertypes- install -d ${D}${base_sbindir}
# Replace upstream ebtables-save perl script with Fedora bash based rewrite
#
http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save
<http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save>
- install -m 0755 ${WORKDIR}/ebtables-legacy-save ${D}${base_sbindir}/ebtables-legacy-save
- sed -i 's!/sbin/!${base_sbindir}/!g' ${D}${base_sbindir}/ebtables-legacy-save
+ rm -f ${D}${sbindir}/ebtables-legacy-save
+ install -m 0755 ${WORKDIR}/ebtables-legacy-save ${D}${sbindir}/ebtables-legacy-save
+
# Install systemd service files
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
install -d ${D}${systemd_unitdir}/system -- 2.25.1Signature · 2 lines
best regards, José Quaresma
PATCH 3/3 ebtables: do not install /etc/ethertypes
In reply to Yi ZhaoRefer to Debian, patch the Makefile to prevent /etc/ethertypes installation instead of removing it in do_install_append.
--- ...ile.am-do-not-install-etc-ethertypes.patch | 34 +++++++++++++++++++ .../ebtables/ebtables_2.0.11.bb | 4 +-- 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0001-Makefile.am-do-not-install-etc-ethertypes.patch
meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0001-Makefile.am-do-not-install-etc-ethertypes.patch new file +34 -0
@@ -0,0 +1,34 @@ +From a822e8dbca017e426a4c1c3ca835d0d03cbb4a4d Mon Sep 17 00:00:00 2001 +From: Yi Zhao <[email protected]> +Date: Thu, 31 Dec 2020 16:09:56 +0800 +Subject: [PATCH] Makefile.am: do not install /etc/ethertypes + +The /etc/ethertypes is provided by netbase since 6.0[1]. +Do not instal the file in ebtables, otherwise there would be a conflict: +Error: Transaction test error: + file /etc/ethertypes conflicts between attempted installs of netbase-1:6.2-r0.corei7_64 and ebtables-2.0.10+4-r4.corei7_64 + +[1] https://salsa.debian.org/md/netbase/-/commit/316680c6a2c3641b6abc76b3eebf88781f609d35) + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <[email protected]> +--- + Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index b879941..2237002 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -26,7 +26,6 @@ AM_CFLAGS = ${regular_CFLAGS} + + sbin_PROGRAMS = ebtables-legacy ebtablesd ebtablesu ebtables-legacy-restore + EXTRA_PROGRAMS = static examples/ulog/test_ulog +-sysconf_DATA = ethertypes + sbin_SCRIPTS = ebtables-legacy-save + man8_MANS = ebtables-legacy.8 + lib_LTLIBRARIES = libebtc.la +-- +2.17.1 +
meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb +1 -3
@@ -12,6 +12,7 @@ RRECOMMENDS_${PN} += "kernel-module-ebtables \ " SRC_URI = "http://ftp.netfilter.org/pub/ebtables/ebtables-${PV}.tar.gz \ + file://0001-Makefile.am-do-not-install-etc-ethertypes.patch \ file://ebtables-legacy-save \ file://ebtables.common \ file://ebtables.service \
@@ -25,9 +26,6 @@ SRC_URI[sha256sum] = "b71f654784a726329f88b412ef7b96b4e5d786ed2bd28193ed7b4c0d67 inherit systemd autotools do_install_append () { - #This file has been provided by netbase - rm -f ${D}${sysconfdir}/ethertypes - # Replace upstream ebtables-save perl script with Fedora bash based rewrite # http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save rm -f ${D}${sbindir}/ebtables-legacy-save
Signature · 1 line
2.25.1
this series fails in do_install see
https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/838
https://errors.yoctoproject.org/Errors/Details/540440/
Quoted 217 lines · Yi Zhao
The ebtables.common is required by ebtables.service. Add it back.
Fixes:
systemd[660]: ebtables.service: Failed to locate executable/usr/sbin/ebtables.common: No such file or directory systemd[660]: ebtables.service: Failed at step EXEC spawning/usr/sbin/ebtables.common: No such file or directorySigned-off-by Yi Zhao <[email protected]>--- .../ebtables/ebtables-2.0.11/ebtables.common | 163 ++++++++++++++++++ .../ebtables/ebtables_2.0.11.bb | 10 +- 2 files changed, 170 insertions(+), 3 deletions(-) create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables.commonmeta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables.common new file +163
-0@@ -0,0 +1,163 @@ +#!/bin/sh + +[ -x /usr/sbin/ebtables-legacy ] || exit 1 + +EBTABLES_DUMPFILE_STEM=/etc/ebtables/dump + +RETVAL=0 +prog="ebtables" +desc="Ethernet bridge filtering" +umask 0077 + +#default configuration +EBTABLES_MODULES_UNLOAD="yes" +EBTABLES_LOAD_ON_START="no" +EBTABLES_SAVE_ON_STOP="no" +EBTABLES_SAVE_ON_RESTART="no" +EBTABLES_SAVE_COUNTER="no" +EBTABLES_BACKUP_SUFFIX="~" + +config=/etc/default/$prog +[ -f "$config" ] && . "$config" + +get_supported_tables() { + EBTABLES_SUPPORTED_TABLES= + /usr/sbin/ebtables-legacy -t filter -L 2>&1 1>/dev/null | grep -q permission + if [ $? -eq 0 ]; then + echo "Error: insufficient privileges to access the ebtables rulesets." + exit 1 + fi + for table in filter nat broute; do + /usr/sbin/ebtables-legacy -t $table -L &> /dev/null + if [ $? -eq 0 ]; then + EBTABLES_SUPPORTED_TABLES="${EBTABLES_SUPPORTED_TABLES} $table" + fi + done +} + +load() { + RETVAL=0 + get_supported_tables + echo -n "Restoring ebtables rulesets: " + for table in $EBTABLES_SUPPORTED_TABLES; do + echo -n "$table " + if [ -s ${EBTABLES_DUMPFILE_STEM}.$table ]; then + /usr/sbin/ebtables-legacy -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-commit + RET=$? + if [ $RET -ne 0 ]; then + echo -n "(failed) " + RETVAL=$RET + fi + else + echo -n "(no saved state) " + fi + done + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo -n "no kernel support. " + else + echo -n "done. " + fi + if [ $RETVAL -eq 0 ]; then + echo "ok" + else + echo "fail" + fi +} + +clear_rules() { + RETVAL=0 + get_supported_tables + echo -n "Clearing ebtables rulesets: " + for table in $EBTABLES_SUPPORTED_TABLES; do + echo -n "$table " + /usr/sbin/ebtables-legacy -t $table --init-table + done + + if [ "$EBTABLES_MODULES_UNLOAD" = "yes" ]; then + for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -d' ' -f1) ebtables; do + rmmod $mod 2> /dev/null + done + fi + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo -n "no kernel support. " + else + echo -n "done. " + fi + if [ $RETVAL -eq 0 ]; then + echo "ok" + else + echo "fail" + fi +} + +save() { + RETVAL=0 + get_supported_tables + echo -n "Saving ebtables rulesets: " + for table in $EBTABLES_SUPPORTED_TABLES; do + echo -n "$table " + [ -n "$EBTABLES_BACKUP_SUFFIX" ] && [ -s ${EBTABLES_DUMPFILE_STEM}.$table ] && \ + mv ${EBTABLES_DUMPFILE_STEM}.$table ${EBTABLES_DUMPFILE_STEM}.$table$EBTABLES_BACKUP_SUFFIX + /usr/sbin/ebtables-legacy -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-save + RET=$? + if [ $RET -ne 0 ]; then + echo -n "(failed) " + RETVAL=$RET + else + if [ "$EBTABLES_SAVE_COUNTER" = "no" ]; then + /usr/sbin/ebtables-legacy -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table -Z + fi + fi + done + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo -n "no kernel support. " + else + echo -n "done. " + fi + if [ $RETVAL -eq 0 ]; then + echo "ok" + else + echo "fail" + fi +} + +case "$1" in + start) + [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load + ;; + stop) + [ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save + clear_rules + ;; + restart|reload|force-reload) + [ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save + clear_rules + [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load + ;; + load) + load + ;; + save) + save + ;; + status) + get_supported_tables + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo "No kernel support for ebtables." + RETVAL=1 + else + echo -n "Ebtables support available, number of installed rules: " + for table in $EBTABLES_SUPPORTED_TABLES; do + COUNT=$(( $(/usr/sbin/ebtables-legacy -t $table -L | sed -e "/^Bridge chain/! d" -e "s/^.*entries: //" -e "s/,.*$/ +/") 0 )) + echo -n "$table($COUNT) " + done + echo ok + RETVAL=0 + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|force-reload|load|save|status}" >&2 + RETVAL=1 +esac + +exit $RETVALmeta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb +7
-4@@ -13,6 +13,7 @@ RRECOMMENDS_${PN} += "kernel-module-ebtables \ SRC_URI = "http://ftp.netfilter.org/pub/ebtables/ebtables-${PV}.tar.gz \ file://ebtables-legacy-save \ + file://ebtables.common \ file://ebtables.service \ "@@ -33,9 +34,12 @@ do_install_append () { install -m 0755 ${WORKDIR}/ebtables-legacy-save ${D}${base_sbindir}/ebtables-legacy-save sed -i 's!/sbin/!${base_sbindir}/!g' ${D}${base_sbindir}/ebtables-legacy-save # Install systemd service files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/ebtables.service ${D}${systemd_unitdir}/system - sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/ebtables.service + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/ebtables.service ${D}${systemd_unitdir}/system + sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/ebtables.service + install -m 0755 ${WORKDIR}/ebtables.common ${D}${sbindir}/ebtables.common + fi } do_configure_prepend () { --2.25.1
Quoted 4 lines · Khem Raj
this series fails in
do_installseehttps://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/838
https://errors.yoctoproject.org/Errors/Details/540440/
This caused by patch [PATCH] ebtables: Add symbol link /sbin/ebtables.
I have sent V2 to fix it.
Thanks,
Yi
Quoted 218 lines · Yi Zhao
Quoted 216 lines
The ebtables.common is required by ebtables.service. Add it back.
Fixes:
systemd[660]: ebtables.service: Failed to locate executable/usr/sbin/ebtables.common: No such file or directory systemd[660]: ebtables.service: Failed at step EXEC spawning/usr/sbin/ebtables.common: No such file or directorySigned-off-by Yi Zhao <[email protected]>--- .../ebtables/ebtables-2.0.11/ebtables.common | 163 ++++++++++++++++++ .../ebtables/ebtables_2.0.11.bb | 10 +- 2 files changed, 170 insertions(+), 3 deletions(-)create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables.common
meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables.common new file +163
-0@@ -0,0 +1,163 @@ +#!/bin/sh + +[ -x /usr/sbin/ebtables-legacy ] || exit 1 + +EBTABLES_DUMPFILE_STEM=/etc/ebtables/dump + +RETVAL=0 +prog="ebtables" +desc="Ethernet bridge filtering" +umask 0077 + +#default configuration +EBTABLES_MODULES_UNLOAD="yes" +EBTABLES_LOAD_ON_START="no" +EBTABLES_SAVE_ON_STOP="no" +EBTABLES_SAVE_ON_RESTART="no" +EBTABLES_SAVE_COUNTER="no" +EBTABLES_BACKUP_SUFFIX="~" + +config=/etc/default/$prog +[ -f "$config" ] && . "$config" + +get_supported_tables() { + EBTABLES_SUPPORTED_TABLES= + /usr/sbin/ebtables-legacy -t filter -L 2>&1 1>/dev/null | grep -q permission + if [ $? -eq 0 ]; then + echo "Error: insufficient privileges to access the ebtables rulesets." + exit 1 + fi + for table in filter nat broute; do + /usr/sbin/ebtables-legacy -t $table -L &> /dev/null + if [ $? -eq 0 ]; then + EBTABLES_SUPPORTED_TABLES="${EBTABLES_SUPPORTED_TABLES} $table" + fi + done +} + +load() { + RETVAL=0 + get_supported_tables + echo -n "Restoring ebtables rulesets: " + for table in $EBTABLES_SUPPORTED_TABLES; do + echo -n "$table " + if [ -s ${EBTABLES_DUMPFILE_STEM}.$table ]; then + /usr/sbin/ebtables-legacy -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-commit + RET=$? + if [ $RET -ne 0 ]; then + echo -n "(failed) " + RETVAL=$RET + fi + else + echo -n "(no saved state) " + fi + done + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo -n "no kernel support. " + else + echo -n "done. " + fi + if [ $RETVAL -eq 0 ]; then + echo "ok" + else + echo "fail" + fi +} + +clear_rules() { + RETVAL=0 + get_supported_tables + echo -n "Clearing ebtables rulesets: " + for table in $EBTABLES_SUPPORTED_TABLES; do + echo -n "$table " + /usr/sbin/ebtables-legacy -t $table --init-table + done + + if [ "$EBTABLES_MODULES_UNLOAD" = "yes" ]; then + for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -d' ' -f1) ebtables; do + rmmod $mod 2> /dev/null + done + fi + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo -n "no kernel support. " + else + echo -n "done. " + fi + if [ $RETVAL -eq 0 ]; then + echo "ok" + else + echo "fail" + fi +} + +save() { + RETVAL=0 + get_supported_tables + echo -n "Saving ebtables rulesets: " + for table in $EBTABLES_SUPPORTED_TABLES; do + echo -n "$table " + [ -n "$EBTABLES_BACKUP_SUFFIX" ] && [ -s ${EBTABLES_DUMPFILE_STEM}.$table ] && \ + mv ${EBTABLES_DUMPFILE_STEM}.$table ${EBTABLES_DUMPFILE_STEM}.$table$EBTABLES_BACKUP_SUFFIX + /usr/sbin/ebtables-legacy -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-save + RET=$? + if [ $RET -ne 0 ]; then + echo -n "(failed) " + RETVAL=$RET + else + if [ "$EBTABLES_SAVE_COUNTER" = "no" ]; then + /usr/sbin/ebtables-legacy -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table -Z + fi + fi + done + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo -n "no kernel support. " + else + echo -n "done. " + fi + if [ $RETVAL -eq 0 ]; then + echo "ok" + else + echo "fail" + fi +} + +case "$1" in + start) + [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load + ;; + stop) + [ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save + clear_rules + ;; + restart|reload|force-reload) + [ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save + clear_rules + [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load + ;; + load) + load + ;; + save) + save + ;; + status) + get_supported_tables + if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then + echo "No kernel support for ebtables." + RETVAL=1 + else + echo -n "Ebtables support available, number of installed rules: " + for table in $EBTABLES_SUPPORTED_TABLES; do + COUNT=$(( $(/usr/sbin/ebtables-legacy -t $table -L | sed -e "/^Bridge chain/! d" -e "s/^.*entries: //" -e "s/,.*$/ +/") 0 )) + echo -n "$table($COUNT) " + done + echo ok + RETVAL=0 + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|force-reload|load|save|status}" >&2 + RETVAL=1 +esac + +exit $RETVALmeta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb +7
-4@@ -13,6 +13,7 @@ RRECOMMENDS_${PN} += "kernel-module-ebtables \ SRC_URI = "http://ftp.netfilter.org/pub/ebtables/ebtables-${PV}.tar.gz \ file://ebtables-legacy-save \ + file://ebtables.common \ file://ebtables.service \ "@@ -33,9 +34,12 @@ do_install_append () { install -m 0755 ${WORKDIR}/ebtables-legacy-save ${D}${base_sbindir}/ebtables-legacy-save sed -i 's!/sbin/!${base_sbindir}/!g' ${D}${base_sbindir}/ebtables-legacy-save # Install systemd service files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/ebtables.service ${D}${systemd_unitdir}/system - sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/ebtables.service + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/ebtables.service ${D}${systemd_unitdir}/system + sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/ebtables.service + install -m 0755 ${WORKDIR}/ebtables.common ${D}${sbindir}/ebtables.common + fi } do_configure_prepend () { --2.25.1