From 515ccbd1d973352956848ae9e8625c1cd214ca3f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 27 Aug 2020 12:21:01 +0200
Subject: [etherwake] Fix etherwake symlink, disable pause frames

---
 core/modules/etherwake/data/opt/openslx/sbin/etherwake             | 1 +
 core/modules/etherwake/module.build                                | 3 ++-
 core/modules/etherwake/opt/openslx/sbin/etherwake                  | 1 -
 core/modules/etherwake/templates/99-enable-wol-disable-pause.rules | 5 +++++
 core/modules/etherwake/templates/99-enable-wol.rules               | 2 --
 5 files changed, 8 insertions(+), 4 deletions(-)
 create mode 120000 core/modules/etherwake/data/opt/openslx/sbin/etherwake
 delete mode 120000 core/modules/etherwake/opt/openslx/sbin/etherwake
 create mode 100644 core/modules/etherwake/templates/99-enable-wol-disable-pause.rules
 delete mode 100644 core/modules/etherwake/templates/99-enable-wol.rules

(limited to 'core/modules/etherwake')

diff --git a/core/modules/etherwake/data/opt/openslx/sbin/etherwake b/core/modules/etherwake/data/opt/openslx/sbin/etherwake
new file mode 120000
index 00000000..25b69dbb
--- /dev/null
+++ b/core/modules/etherwake/data/opt/openslx/sbin/etherwake
@@ -0,0 +1 @@
+jawol
\ No newline at end of file
diff --git a/core/modules/etherwake/module.build b/core/modules/etherwake/module.build
index d9648025..50b24da5 100644
--- a/core/modules/etherwake/module.build
+++ b/core/modules/etherwake/module.build
@@ -15,7 +15,8 @@ build() {
 	cde "$MODULE_BUILD_DIR"
 
 	mkdir -p "${MODULE_BUILD_DIR}/etc/udev/rules.d"
-	sed "s,%ETHTOOL%,$(which ethtool)," "${MODULE_DIR}/templates/99-enable-wol.rules" > "${MODULE_BUILD_DIR}/etc/udev/rules.d/99-enable-wol.rules" \
+	sed "s,%ETHTOOL%,$(which ethtool)," "${MODULE_DIR}/templates/99-enable-wol-disable-pause.rules" \
+		> "${MODULE_BUILD_DIR}/etc/udev/rules.d/99-enable-wol-disable-pause.rules" \
 		|| perror "Cannot write udev rule to enable WOL"
 
 	local COPYLIST="list_dpkg_output"
diff --git a/core/modules/etherwake/opt/openslx/sbin/etherwake b/core/modules/etherwake/opt/openslx/sbin/etherwake
deleted file mode 120000
index 25b69dbb..00000000
--- a/core/modules/etherwake/opt/openslx/sbin/etherwake
+++ /dev/null
@@ -1 +0,0 @@
-jawol
\ No newline at end of file
diff --git a/core/modules/etherwake/templates/99-enable-wol-disable-pause.rules b/core/modules/etherwake/templates/99-enable-wol-disable-pause.rules
new file mode 100644
index 00000000..719d872b
--- /dev/null
+++ b/core/modules/etherwake/templates/99-enable-wol-disable-pause.rules
@@ -0,0 +1,5 @@
+# Enable WOL on boot NIC
+ACTION=="add", SUBSYSTEM=="net", NAME=="eth0", RUN+="%ETHTOOL% -s $name wol g"
+ACTION=="add", SUBSYSTEM=="net", NAME=="boot0", RUN+="%ETHTOOL% -s $name wol g"
+# Disaable pause frames on any adapter found
+ACTION=="add", SUBSYSTEM=="net", RUN+="%ETHTOOL% -A $name autoneg off rx off tx off"
diff --git a/core/modules/etherwake/templates/99-enable-wol.rules b/core/modules/etherwake/templates/99-enable-wol.rules
deleted file mode 100644
index 0a9d2fc3..00000000
--- a/core/modules/etherwake/templates/99-enable-wol.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-ACTION=="add", SUBSYSTEM=="net", NAME=="eth0", RUN+="%ETHTOOL% -s $name wol g"
-ACTION=="add", SUBSYSTEM=="net", NAME=="boot0", RUN+="%ETHTOOL% -s $name wol g"
-- 
cgit v1.2.3-55-g7522