summary refs log tree commit diff
path: root/pkgs/tools/networking/wicd
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-02-23 20:06:21 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-02-23 20:06:21 +0000
commit38e3d7bc86d2a48dd4d653fd3f142f422c075563 (patch)
treec393d2e331ff60908a2e00727fa4d2b852e85d3b /pkgs/tools/networking/wicd
parent79232c5f54c47e8359262601243d2878e2ab5512 (diff)
parent65e7aeda65e30ceb44c6d8773bbf69dd122bd9c9 (diff)
downloadnixlib-38e3d7bc86d2a48dd4d653fd3f142f422c075563.tar
nixlib-38e3d7bc86d2a48dd4d653fd3f142f422c075563.tar.gz
nixlib-38e3d7bc86d2a48dd4d653fd3f142f422c075563.tar.bz2
nixlib-38e3d7bc86d2a48dd4d653fd3f142f422c075563.tar.lz
nixlib-38e3d7bc86d2a48dd4d653fd3f142f422c075563.tar.xz
nixlib-38e3d7bc86d2a48dd4d653fd3f142f422c075563.tar.zst
nixlib-38e3d7bc86d2a48dd4d653fd3f142f422c075563.zip
svn merge ^/nixpkgs/trunk
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
Diffstat (limited to 'pkgs/tools/networking/wicd')
-rw-r--r--pkgs/tools/networking/wicd/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 3f0ff4210922..1f3240997d96 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -90,11 +90,13 @@ stdenv.mkDerivation rec {
     echo '#!/bin/sh
 initctl emit -n wicd-preconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/preconnect/upstart-emit
     echo '#!/bin/sh
-initctl emit -n wicd-postconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/postconnect/upstart-emit
+initctl emit -n wicd-postconnect ITYPE="$1" ESSID="$2" BSSID="$3"
+initctl emit -n ip-up' > $out/etc/scripts/postconnect/upstart-emit
     echo '#!/bin/sh
 initctl emit -n wicd-predisconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/predisconnect/upstart-emit
     echo '#!/bin/sh
-initctl emit -n wicd-postdisconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/postdisconnect/upstart-emit
+initctl emit -n wicd-postdisconnect ITYPE="$1" ESSID="$2" BSSID="$3"
+initctl emit -n ip-down' > $out/etc/scripts/postdisconnect/upstart-emit
     chmod a+x $out/etc/scripts/*/upstart-emit
   '';