Merging upstream version 20220524.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 151 insertions, 1 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 950a499..4750c15 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,11 @@
+2022-05-24	Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+	* Releasing version 20220524.
+
+	[ Daniel Baumann ]
+	* Updating dehydrated todo file.
+	* Adding ethtool-i40e.
+
 2022-04-30	Daniel Baumann <daniel.baumann@open-infrastructure.net>
 
 	* Releasing version 20220430.
diff --git a/VERSION.txt b/VERSION.txt
index bbfd1ea..7d93d38 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20220430
+20220524
diff --git a/dehydrated/TODO b/dehydrated/TODO
index 9295784..1576ab5 100644
--- a/dehydrated/TODO
+++ b/dehydrated/TODO
@@ -6,3 +6,4 @@ TODO
   * maybe handling multiple different CNAMEs
     (not sure if letsencrypt allows that, however, dehydrated-nsupdate only
     processes one CNAME)
+  * use settings from _dehydrated.$domain.$tld
diff --git a/ethtool/Makefile b/ethtool/Makefile
new file mode 100644
index 0000000..278e7e5
--- /dev/null
+++ b/ethtool/Makefile
@@ -0,0 +1,88 @@
+# Open Infrastructure: service-tools
+
+# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+#
+# SPDX-License-Identifier: GPL-3.0+
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+SHELL := sh -e
+
+SCRIPTS = bin/*
+
+all: build
+
+test:
+	@echo -n "Checking for syntax errors with sh... "
+	@for SCRIPT in $(SCRIPTS); \
+	do \
+		sh -n $${SCRIPT}; \
+		echo -n "."; \
+	done
+	@echo " done."
+
+	@echo -n "Checking for bashisms... "
+	@if [ -x /usr/bin/checkbashisms ]; \
+	then \
+		for SCRIPT in $(SCRIPTS); \
+		do \
+			checkbashisms -f -x $${SCRIPT}; \
+			echo -n "."; \
+		done; \
+	else \
+		echo "Note: devscripts not installed, skipping checkbashisms."; \
+	fi
+	@echo " done."
+
+	@echo -n "Checking with shellcheck... "
+	@if [ -x /usr/bin/shellcheck ]; \
+	then \
+		for SCRIPT in $(SCRIPTS); \
+		do \
+			shellcheck -e SC2039 $${SCRIPT}; \
+			echo -n "."; \
+		done; \
+	else \
+		echo "Note: shellcheck not installed, skipping shellcheck."; \
+	fi
+	@echo " done."
+
+build:
+
+install: build
+	mkdir -p $(DESTDIR)/usr/bin
+	cp -r bin/* $(DESTDIR)/usr/bin
+
+	mkdir -p $(DESTDIR)/lib/systemd/system
+	cp -r share/systemd/* $(DESTDIR)/lib/systemd/system
+
+uninstall:
+	for FILE in share/systemd/*; \
+	do \
+		rm -f $(DESTDIR)/lib/systemd/system/$$(basename $${FILE}); \
+	done
+
+	for FILE in bin/*; \
+	do \
+		rm -f $(DESTDIR)/usr/bin/$$(basename $${FILE}); \
+	done
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/bin || true
+
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR) || true
+
+clean:
+
+distclean:
+
+reinstall: uninstall install
diff --git a/ethtool/bin/ethtool-i40e b/ethtool/bin/ethtool-i40e
new file mode 100755
index 0000000..637ae65
--- /dev/null
+++ b/ethtool/bin/ethtool-i40e
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# Open Infrastructure: service-tools
+
+# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+#
+# SPDX-License-Identifier: GPL-3.0+
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+set -e
+
+PROGRAM="$(basename ${0})"
+DEVICES="$(grep DRIVER=i40e /sys/class/net/*/device/uevent | awk -F/ '{ print $5 }' | sort -V)"
+
+if [ -z "${DEVICES}" ]
+then
+	echo "'${PROGRAM}': no network devices available with i40e driver"
+fi
+
+for DEVICE in ${DEVICES}
+do
+	echo -n "'${DEVICE}': disabling FW LLDP..."
+	ethtool --set-priv-flags ${DEVICE} disable-fw-lldp on
+	echo " done."
+done
diff --git a/ethtool/share/systemd/ethtool-i40e.service b/ethtool/share/systemd/ethtool-i40e.service
new file mode 100644
index 0000000..e578d35
--- /dev/null
+++ b/ethtool/share/systemd/ethtool-i40e.service
@@ -0,0 +1,16 @@
+# Open Infrastructure: service-tools
+
+[Unit]
+Description=ethtool-i40e options
+Documentation=man:ethotool-i40e
+Before=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/ethtool-i40e
+StandardOutput=journal
+StandardError=journal
+
+[Install]
+WantedBy=multi-user.target