From 1ec68e0d13cb896525d142ab3d1980ce27fd5368 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 13 Jan 2015 15:49:14 -0800 Subject: kernel: Fix path to stp bridge helper --- pkgs/os-specific/linux/kernel/bridge-stp-helper.patch | 13 +++++++++++++ pkgs/os-specific/linux/kernel/patches.nix | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/bridge-stp-helper.patch (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/kernel/bridge-stp-helper.patch b/pkgs/os-specific/linux/kernel/bridge-stp-helper.patch new file mode 100644 index 00000000000..70d0f944c2a --- /dev/null +++ b/pkgs/os-specific/linux/kernel/bridge-stp-helper.patch @@ -0,0 +1,13 @@ +diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h +index aea3d13..8fcbf81 100644 +--- a/net/bridge/br_private.h ++++ b/net/bridge/br_private.h +@@ -39,7 +39,7 @@ + #define BR_GROUPFWD_8021AD 0xB801u + + /* Path to usermode spanning tree program */ +-#define BR_STP_PROG "/sbin/bridge-stp" ++#define BR_STP_PROG "/run/current-system/sw/bin/bridge-stp" + + typedef struct bridge_id bridge_id; + typedef struct mac_addr mac_addr; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 6265a2eea18..f712d57c8f0 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -32,6 +32,11 @@ in rec { + bridge_stp_helper = + { name = "bridge-stp-helper"; + patch = ./bridge-stp-helper.patch; + }; + no_xsave = { name = "no-xsave"; patch = ./no-xsave.patch; -- cgit 1.4.1