r8125: use pkgname-based modprobe.d filename to avoid conflicts

ptr1337 · ptr1337 · commit 795002579d76 · 2026-02-19T16:51:09.000+01:00
Signed-off-by: Peter Jung &lt;admin@ptr1337.dev&gt;
diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD
@@ -720,7 +720,7 @@ _package-r8125() {
 
     # Blacklist r8169 so that r8125 is used instead
     install -dm755 "${pkgdir}/usr/lib/modprobe.d"
-    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
 }
 
 pkgname=("$pkgbase")
diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
@@ -720,7 +720,7 @@ _package-r8125() {
 
     # Blacklist r8169 so that r8125 is used instead
     install -dm755 "${pkgdir}/usr/lib/modprobe.d"
-    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
 }
 
 pkgname=("$pkgbase")
diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD
@@ -724,7 +724,7 @@ _package-r8125() {
 
     # Blacklist r8169 so that r8125 is used instead
     install -dm755 "${pkgdir}/usr/lib/modprobe.d"
-    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
 }
 
 pkgname=("$pkgbase")
diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD
@@ -720,7 +720,7 @@ _package-r8125() {
 
     # Blacklist r8169 so that r8125 is used instead
     install -dm755 "${pkgdir}/usr/lib/modprobe.d"
-    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
 }
 
 pkgname=("$pkgbase")
diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD
@@ -709,7 +709,7 @@ _package-r8125() {
 
     # Blacklist r8169 so that r8125 is used instead
     install -dm755 "${pkgdir}/usr/lib/modprobe.d"
-    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
 }
 
 pkgname=("$pkgbase")
diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD
@@ -718,7 +718,7 @@ _package-r8125() {
 
     # Blacklist r8169 so that r8125 is used instead
     install -dm755 "${pkgdir}/usr/lib/modprobe.d"
-    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
 }
 
 pkgname=("$pkgbase")
diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
@@ -785,7 +785,7 @@ _package-r8125() {
 
     # Blacklist r8169 so that r8125 is used instead
     install -dm755 "${pkgdir}/usr/lib/modprobe.d"
-    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
 }
 
 pkgname=("$pkgbase")
diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD
@@ -720,7 +720,7 @@ _package-r8125() {
 
     # Blacklist r8169 so that r8125 is used instead
     install -dm755 "${pkgdir}/usr/lib/modprobe.d"
-    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
 }
 
 pkgname=("$pkgbase")
diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD
@@ -720,7 +720,7 @@ _package-r8125() {
 
     # Blacklist r8169 so that r8125 is used instead
     install -dm755 "${pkgdir}/usr/lib/modprobe.d"
-    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
 }
 
 pkgname=("$pkgbase")
diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
@@ -792,7 +792,7 @@ _package-r8125() {
 
     # Blacklist r8169 so that r8125 is used instead
     install -dm755 "${pkgdir}/usr/lib/modprobe.d"
-    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"
+    echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
 }
 
 pkgname=("$pkgbase")

Original file line number	Diff line number	Diff line change
`@@ -720,7 +720,7 @@ _package-r8125() {`
`720`	`720`
`721`	`721`	`# Blacklist r8169 so that r8125 is used instead`
`722`	`722`	`install -dm755 "${pkgdir}/usr/lib/modprobe.d"`
`723`		`- echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"`
	`723`	`+ echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"`
`724`	`724`	`}`
`725`	`725`
`726`	`726`	`pkgname=("$pkgbase")`
Original file line number	Diff line number	Diff line change
`@@ -724,7 +724,7 @@ _package-r8125() {`
`724`	`724`
`725`	`725`	`# Blacklist r8169 so that r8125 is used instead`
`726`	`726`	`install -dm755 "${pkgdir}/usr/lib/modprobe.d"`
`727`		`- echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"`
	`727`	`+ echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"`
`728`	`728`	`}`
`729`	`729`
`730`	`730`	`pkgname=("$pkgbase")`
Original file line number	Diff line number	Diff line change
`@@ -709,7 +709,7 @@ _package-r8125() {`
`709`	`709`
`710`	`710`	`# Blacklist r8169 so that r8125 is used instead`
`711`	`711`	`install -dm755 "${pkgdir}/usr/lib/modprobe.d"`
`712`		`- echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"`
	`712`	`+ echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"`
`713`	`713`	`}`
`714`	`714`
`715`	`715`	`pkgname=("$pkgbase")`
Original file line number	Diff line number	Diff line change
`@@ -718,7 +718,7 @@ _package-r8125() {`
`718`	`718`
`719`	`719`	`# Blacklist r8169 so that r8125 is used instead`
`720`	`720`	`install -dm755 "${pkgdir}/usr/lib/modprobe.d"`
`721`		`- echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"`
	`721`	`+ echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"`
`722`	`722`	`}`
`723`	`723`
`724`	`724`	`pkgname=("$pkgbase")`
Original file line number	Diff line number	Diff line change
`@@ -785,7 +785,7 @@ _package-r8125() {`
`785`	`785`
`786`	`786`	`# Blacklist r8169 so that r8125 is used instead`
`787`	`787`	`install -dm755 "${pkgdir}/usr/lib/modprobe.d"`
`788`		`- echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"`
	`788`	`+ echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"`
`789`	`789`	`}`
`790`	`790`
`791`	`791`	`pkgname=("$pkgbase")`
Original file line number	Diff line number	Diff line change
`@@ -792,7 +792,7 @@ _package-r8125() {`
`792`	`792`
`793`	`793`	`# Blacklist r8169 so that r8125 is used instead`
`794`	`794`	`install -dm755 "${pkgdir}/usr/lib/modprobe.d"`
`795`		`- echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/r8125.conf"`
	`795`	`+ echo "blacklist r8169" > "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"`
`796`	`796`	`}`
`797`	`797`
`798`	`798`	`pkgname=("$pkgbase")`