diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2005-08-21 22:37:31 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2005-08-21 22:37:31 +0000 |
| commit | acc1db9ac632c05456f6830457b739fa32c712dc (patch) | |
| tree | 275a0a317ee45f1f55271baceff77cab134ddf2d | |
| parent | 77c089a8573148114647dbd1e70ecf68bbb59e15 (diff) | |
| download | nixlib-acc1db9ac632c05456f6830457b739fa32c712dc.tar nixlib-acc1db9ac632c05456f6830457b739fa32c712dc.tar.gz nixlib-acc1db9ac632c05456f6830457b739fa32c712dc.tar.bz2 nixlib-acc1db9ac632c05456f6830457b739fa32c712dc.tar.lz nixlib-acc1db9ac632c05456f6830457b739fa32c712dc.tar.xz nixlib-acc1db9ac632c05456f6830457b739fa32c712dc.tar.zst nixlib-acc1db9ac632c05456f6830457b739fa32c712dc.zip | |
use execv instead of execve
svn path=/nixpkgs/trunk/; revision=3657
| -rw-r--r-- | pkgs/tools/networking/dhcp/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/dhcp/dhclient-execve.patch | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index d0e0893bc28a..eea9e7dbae19 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -8,5 +8,5 @@ stdenv.mkDerivation { md5 = "f91416a0b8ed3fd0601688cf0b7df58f"; }; buildInputs = [groff]; -# patches = [./dhcp-makefile.patch]; + patches = [./dhclient-execve.patch]; } diff --git a/pkgs/tools/networking/dhcp/dhclient-execve.patch b/pkgs/tools/networking/dhcp/dhclient-execve.patch new file mode 100644 index 000000000000..04690e122b44 --- /dev/null +++ b/pkgs/tools/networking/dhcp/dhclient-execve.patch @@ -0,0 +1,13 @@ +diff -ruN dhcp-3.0.3/client/dhclient.c dhcp-3.0.3.new/client/dhclient.c +--- dhcp-3.0.3/client/dhclient.c 2005-03-03 17:55:22.000000000 +0100 ++++ dhcp-3.0.3.new/client/dhclient.c 2005-08-21 22:23:49.000000000 +0200 +@@ -2607,7 +2607,8 @@ + wstatus = 0; + } + } else { +- execve (scriptName, argv, envp); ++ /* execve (scriptName, argv, envp); */ ++ execv (scriptName, argv); + log_error ("execve (%s, ...): %m", scriptName); + exit (0); + } |