diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-11 12:47:00 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-11 12:47:00 +0000 |
commit | ee04ffcb550809f7d97d709ff4ec709a21b30ab9 (patch) | |
tree | 470bdb3f97b0ab18d3abeec3e1f59db7a4af34ed /pkgs/tools/networking/wicd/mkdir-networks.patch | |
parent | 3f1a32c266f792290cb08c45ab40f22a43cb13cb (diff) | |
parent | 97d4a54698a4dea4b57ec4124591d75a740ee44e (diff) | |
download | nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.gz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.bz2 nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.lz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.xz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.zst nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.zip |
Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
Diffstat (limited to 'pkgs/tools/networking/wicd/mkdir-networks.patch')
-rw-r--r-- | pkgs/tools/networking/wicd/mkdir-networks.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/tools/networking/wicd/mkdir-networks.patch b/pkgs/tools/networking/wicd/mkdir-networks.patch index df3f0487d1da..01563fd55dab 100644 --- a/pkgs/tools/networking/wicd/mkdir-networks.patch +++ b/pkgs/tools/networking/wicd/mkdir-networks.patch @@ -1,11 +1,12 @@ -wicd normally makes the NETWORKS directory at install time, but we cannot do that, -so we make it at runtime instead. +wicd normally makes the NETWORKS directory and install the dhclient.conf.template.default at install time, +but we cannot do that, so we make it at runtime instead. ---- wicd-1.6.2.2/in/scripts=wicd.in 2009-09-01 11:05:31.000000000 -0400 -+++ wicd-1.6.2.2/in/scripts=wicd.in 2010-01-04 18:01:57.000000000 -0500 -@@ -1,3 +1,5 @@ +--- wicd-1.7.0/in/scripts=wicd.in 2010-01-14 23:49:11.000000000 -0500 ++++ wicd-1.7.0/in/scripts=wicd.in 2010-11-16 22:35:50.272555487 -0500 +@@ -1,3 +1,6 @@ #!/bin/bash +mkdir -p %NETWORKS% ++ln -sf @TEMPLATE-DEFAULT@ %ETC%dhclient.conf.template.default + - exec python -O %LIB%wicd-daemon.py $@ + exec %PYTHON% -O %SHARE%daemon/wicd-daemon.py $@ |