diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2006-04-11 13:54:51 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2006-04-11 13:54:51 +0000 |
| commit | e25b3eaf4af3855830d5dc52d9b8969074eee850 (patch) | |
| tree | 303af933e4061164f579459b15a76c3b23a8e80c /net-misc | |
| parent | uh, please mr repoman wont you generate me a Manifest (diff) | |
| download | gentoo-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')
| -rw-r--r-- | net-misc/dhcpcd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-2.0.4-exit.patch | 23 |
2 files changed, 15 insertions, 14 deletions
diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog index 53c8e72a0d45..15558f1c4b83 100644 --- a/net-misc/dhcpcd/ChangeLog +++ b/net-misc/dhcpcd/ChangeLog @@ -1,14 +1,14 @@ # ChangeLog for net-misc/dhcpcd # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.86 2006/04/11 11:40:32 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.87 2006/04/11 13:54:51 uberlord Exp $ *dhcpcd-2.0.4-r1 (11 Apr 2006) 11 Apr 2006; Roy Marples <uberlord@gentoo.org> +files/dhcpcd-2.0.4-exit.patch, +dhcpcd-2.0.4-r1.ebuild: Fix a regression in dhcpcd-2.0.4 where we would exit with a zero status - if we failed to get a lease. Also, we now report errors to stderr as well - as syslog. + if we failed to get a lease. Also, we now report timeout errors to + stderr as well as syslog. *dhcpcd-2.0.4 (07 Apr 2006) 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 ) - { |