jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #53905 from dtzWill/fix/nm-thudnerbolt-dont-use-abs-path-for-builtin

Browse Source 
networkmanager: leave thunderbolt rule alone, it's builtin
This commit is contained in:
Will Dietz 2019-01-16 11:07:38 -06:00 committed by GitHub
commit 2ba1485c7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/networking/network-manager/fix-paths.patch
View File

@ -22,17 +22,6 @@
+PROGRAM="@shell@ -c '@ethtool@/bin/ethtool -i $1 | @coreutils@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c" +PROGRAM="@shell@ -c '@ethtool@/bin/ethtool -i $1 | @coreutils@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c"
LABEL="nm_drivers_end" LABEL="nm_drivers_end"
--- a/data/90-nm-thunderbolt.rules
+++ b/data/90-nm-thunderbolt.rules
@@ -5,7 +5,7 @@
# Load he thunderbolt-net driver if we a device of type thunderbolt_xdomain
# is added.
-SUBSYSTEM=="thunderbolt", ENV{DEVTYPE}=="thunderbolt_xdomain", RUN{builtin}+="kmod load thunderbolt-net"
+SUBSYSTEM=="thunderbolt", ENV{DEVTYPE}=="thunderbolt_xdomain", RUN{builtin}+="@kmod@/bin/kmod load thunderbolt-net"
# For all thunderbolt network devices, we want to enable link-local configuration
SUBSYSTEM=="net", ENV{ID_NET_DRIVER}=="thunderbolt-net", ENV{NM_AUTO_DEFAULT_LINK_LOCAL_ONLY}="1"
--- a/data/NetworkManager.service.in --- a/data/NetworkManager.service.in
+++ b/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@