diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-19 21:31:51 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-19 21:31:51 +0000 |
commit | 84c018503859be28aded86677c9dbc54c7067e11 (patch) | |
tree | 44896c72bb5eaddc3b9ebc5e4701f40560774ff0 /pkgs/tools/networking/wicd | |
parent | 3980444b2b918ef74ac7b9f1128f399767d06fa1 (diff) | |
parent | b94fef3cbad6b3b830f8f7c4a987c65c81c9e93d (diff) | |
download | nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.gz nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.bz2 nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.lz nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.xz nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.zst nixlib-84c018503859be28aded86677c9dbc54c7067e11.zip |
svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
Diffstat (limited to 'pkgs/tools/networking/wicd')
-rw-r--r-- | pkgs/tools/networking/wicd/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 9c1f8c8dd39e..3f0ff4210922 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -85,6 +85,17 @@ stdenv.mkDerivation rec { # <http://wicd.net/punbb/viewtopic.php?id=87>. cp -v "${./wpa2-ttls}" "$out/etc/encryption/templates/wpa2-ttls" echo "wpa2-ttls" >> "$out/etc/encryption/templates/active" + + # have wicd generate upstart events + 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 + 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 + chmod a+x $out/etc/scripts/*/upstart-emit ''; meta = { |