9 files changed, 113 insertions, 22 deletions
diff --git a/linux/Makefile b/linux/Makefile
index 09978b9..8274c79 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -1,6 +1,6 @@
 # Open Infrastructure: service-tools
 
-# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -64,9 +64,6 @@ install: build
 	mkdir -p $(DESTDIR)/usr/bin
 	cp -r bin/* $(DESTDIR)/usr/bin
 
-	mkdir -p $(DESTDIR)/etc/modprobe.d
-	cp share/kmod/* $(DESTDIR)/etc/modprobe.d
-
 	mkdir -p $(DESTDIR)/lib/systemd/system
 	cp -r share/systemd/* $(DESTDIR)/lib/systemd/system
 
@@ -76,12 +73,6 @@ uninstall:
 		rm -f $(DESTDIR)/lib/systemd/system/$$(basename $${FILE}); \
 	done
 
-	for FILE in share/kmod/*; \
-	do \
-		rm -f $(DESTDIR)/etc/modprobe.d/$$(basename $${FILE}); \
-	done
-	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/modprobe.d || true
-
 	for FILE in bin/*; \
 	do \
 		rm -f $(DESTDIR)/usr/bin/$$(basename $${FILE}); \
diff --git a/linux/bin/linux-i40e b/linux/bin/linux-i40e
index ffe17b3..9ab0426 100755
--- a/linux/bin/linux-i40e
+++ b/linux/bin/linux-i40e
@@ -2,7 +2,7 @@
 
 # Open Infrastructure: service-tools
 
-# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -130,7 +130,7 @@ then
 	exit 1
 fi
 
-DEVICES="$(grep -s '^DRIVER=i40e' /sys/class/net/*/device/uevent | awk -F/ '{ print $5 }' | sort -V)"
+DEVICES="$(grep -s '^DRIVER=i40e' /sys/class/net/*/device/uevent | awk -F/ '{ print $5 }' | grep -v eno | sort -V)"
 
 if [ -z "${DEVICES}" ]
 then
diff --git a/linux/bin/linux-leds b/linux/bin/linux-ice
index ffe17b3..5f0feee 100755
--- a/linux/bin/linux-leds
+++ b/linux/bin/linux-ice
@@ -2,7 +2,7 @@
 
 # Open Infrastructure: service-tools
 
-# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -130,11 +130,11 @@ then
 	exit 1
 fi
 
-DEVICES="$(grep -s '^DRIVER=i40e' /sys/class/net/*/device/uevent | awk -F/ '{ print $5 }' | sort -V)"
+DEVICES="$(grep -s '^DRIVER=ice' /sys/class/net/*/device/uevent | awk -F/ '{ print $5 }' | grep -v eno | sort -V)"
 
 if [ -z "${DEVICES}" ]
 then
-	echo "'${PROGRAM}': no network devices available with i40e driver" >&2
+	echo "'${PROGRAM}': no network devices available with ice driver" >&2
 fi
 
 case "${1}" in
diff --git a/linux/share/kmod/linux-leds.conf b/linux/share/kmod/linux-leds.conf
deleted file mode 100644
index 8e00229..0000000
--- a/linux/share/kmod/linux-leds.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# /etc/modprobe.d/linux-leds.conf
-
-blacklist pcengines-apuv2
-ledtrig_netdev
diff --git a/linux/share/man/Makefile b/linux/share/man/Makefile
index a6d6bf2..ce5fe50 100644
--- a/linux/share/man/Makefile
+++ b/linux/share/man/Makefile
@@ -1,6 +1,6 @@
 # Open Infrastructure: service-tools
 
-# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
diff --git a/linux/share/man/linux-i40e.1.rst b/linux/share/man/linux-i40e.1.rst
index f4c2eb7..890ac02 100644
--- a/linux/share/man/linux-i40e.1.rst
+++ b/linux/share/man/linux-i40e.1.rst
@@ -1,6 +1,6 @@
 .. Open Infrastructure: service-tools
 
-.. Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+.. Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 ..
 .. SPDX-License-Identifier: GPL-3.0+
 ..
@@ -59,6 +59,7 @@ Recommended options
 See also
 ========
 
+| linux-ice(1),
 | ethtool(8),
 | https://www.kernel.org/doc/Documentation/networking/i40e.txt
 
diff --git a/linux/share/man/linux-ice.1.rst b/linux/share/man/linux-ice.1.rst
new file mode 100644
index 0000000..1abfb90
--- /dev/null
+++ b/linux/share/man/linux-ice.1.rst
@@ -0,0 +1,86 @@
+.. Open Infrastructure: service-tools
+
+.. Copyright (C) 2014-2023 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/>.
+
+=========
+linux-ice
+=========
+
+------------------------------------------------------------
+setting recommended options for the Linux ice device driver
+------------------------------------------------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **linux-ice** start|stop|status
+
+Description
+===========
+
+**linux-ice** sets all recommended options for the Linux ice device driver.
+
+Recommended options
+===================
+
+| **Enabling disable-fw-lldp**
+| Many Intel network cards such as the X700 Series drop LLDP pakets by default.
+| When using LACP (802.1ad) this has the effect that after a reboot of one switch,
+| the bond interfaces do not recover. Disabling the firewalling of LLDP pakets on
+| the network card allows the operating system (= Linux kernel) to actually recieve
+| the pakets and re-establish the bonded connection.
+
+| **Enabling link-down-on-close**
+| Many Intel network cards such as the X700 Series do not take down the link
+| when the corresponding interface is deconfigured. This is in contrast to the
+| consumer (Intel) network cards that usually do this. Therefore, without enabling
+| the link-down-on-close, most assumptions of HA stacks (e.g. pacemaker/corosync)
+| are not met and can lead to various unwanted effects. Enabling this options
+| restores the usual behaviour.
+
+See also
+========
+
+| linux-i40e(1),
+| ethtool(8),
+| https://www.kernel.org/doc/Documentation/networking/ice.txt
+
+Homepage
+========
+
+More information about service-tools and the Open Infrastructure project can be
+found on the homepage (https://open-infrastructure.net).
+
+Contact
+=======
+
+Bug reports, feature requests, help, patches, support and everything else are
+welcome on the Open Infrastructure Software Mailing List
+<software@lists.open-infrastructure.net>.
+
+Debian specific bugs can also be reported in the Debian Bug Tracking System
+(https://bugs.debian.org).
+
+Authors
+=======
+
+service-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/linux/share/man/man.in b/linux/share/man/man.in
index f95ca67..bcc6362 100644
--- a/linux/share/man/man.in
+++ b/linux/share/man/man.in
@@ -1,6 +1,6 @@
 .\" Open Infrastructure: service-tools
 .\"
-.\" Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+.\" Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 .\"
 .\" SPDX-License-Identifier: GPL-3.0+
 .\"
diff --git a/linux/share/systemd/linux-ice.service b/linux/share/systemd/linux-ice.service
new file mode 100644
index 0000000..ee8a727
--- /dev/null
+++ b/linux/share/systemd/linux-ice.service
@@ -0,0 +1,17 @@
+# Open Infrastructure: service-tools
+
+[Unit]
+Description=setting recommended options for the Linux ice device driver
+Documentation=man:linux-ice
+Before=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/linux-ice start
+ExecStop=/usr/bin/linux-ice stop
+StandardOutput=journal
+StandardError=journal
+
+[Install]
+WantedBy=multi-user.target