summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2006-04-11 13:54:51 +0000
committerRoy Marples <uberlord@gentoo.org>2006-04-11 13:54:51 +0000
commite25b3eaf4af3855830d5dc52d9b8969074eee850 (patch)
tree303af933e4061164f579459b15a76c3b23a8e80c /net-misc/dhcpcd/files
parentuh, please mr repoman wont you generate me a Manifest (diff)
downloadgentoo-2-e25b3eaf4af3855830d5dc52d9b8969074eee850.tar.gz
gentoo-2-e25b3eaf4af3855830d5dc52d9b8969074eee850.tar.bz2
gentoo-2-e25b3eaf4af3855830d5dc52d9b8969074eee850.zip
Fix patch so we just show timeout errors.
(Portage version: 2.1_pre7-r5)
Diffstat (limited to 'net-misc/dhcpcd/files')
-rw-r--r--net-misc/dhcpcd/files/dhcpcd-2.0.4-exit.patch23
1 files changed, 12 insertions, 11 deletions
diff --git a/net-misc/dhcpcd/files/dhcpcd-2.0.4-exit.patch b/net-misc/dhcpcd/files/dhcpcd-2.0.4-exit.patch
index 94cf796a31a5..76daa9a17bde 100644
--- a/net-misc/dhcpcd/files/dhcpcd-2.0.4-exit.patch
+++ b/net-misc/dhcpcd/files/dhcpcd-2.0.4-exit.patch
@@ -1,5 +1,17 @@
--- src/signals.c
+++ src/signals.c
+@@ -110,7 +110,10 @@
+ if ( currState == &dhcpReboot )
+ siglongjmp(env,4); /* failed to acquire the same IP address */
+ else
+- syslog(LOG_ERR,"timed out waiting for a valid DHCP server response\n");
++ {
++ syslog(LOG_ERR,"timed out waiting for a valid DHCP server response\n");
++ fprintf(stderr,"timed out waiting for a valid DHCP server response\n");
++ }
+ }
+ }
+ }
@@ -129,7 +129,7 @@
if (!Persistent && sig != SIGTERM)
dhcpStop();
@@ -9,14 +21,3 @@
}
/*****************************************************************************/
void signalSetup()
---- src/dhcpcd.c
-+++ src/dhcpcd.c
-@@ -427,7 +427,7 @@
- if ( killFlag ) killPid(killFlag);
- if ( ! TestCase ) checkIfAlreadyRunning();
- if ( versionFlag ) print_version();
-- openlog(PACKAGE,LOG_PID|(DebugFlag?LOG_CONS:0),LOG_LOCAL0);
-+ openlog(PACKAGE,LOG_PID|(DebugFlag?LOG_CONS:0)|LOG_PERROR,LOG_LOCAL0);
- signalSetup();
- if ( mkdir(ConfigDir,S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) && errno != EEXIST )
- {