diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | loader2/log.c | 4 | ||||
| -rw-r--r-- | loader2/log.h | 1 | ||||
| -rw-r--r-- | loader2/net.c | 10 |
4 files changed, 16 insertions, 2 deletions
@@ -3,6 +3,9 @@ * loader2/cdinstall.c (kickstartFromCD): Look for the kickstart file on all CD drives (notting, #197192). + * loader2/net.c (doDhcp): Pass the debug log level to + pumpDhcpClassRun (markmc, #197175). + 2006-06-28 Jeremy Katz <katzj@redhat.com> * anaconda.spec: Bump version, require yum 2.9.2 diff --git a/loader2/log.c b/loader2/log.c index 5c1637dff..e93a87a78 100644 --- a/loader2/log.c +++ b/loader2/log.c @@ -127,3 +127,7 @@ void closeLog(void) { void setLogLevel(int level) { minLevel = level; } + +int getLogLevel(void) { + return minLevel; +} diff --git a/loader2/log.h b/loader2/log.h index 71cafba1c..48e64c2f1 100644 --- a/loader2/log.h +++ b/loader2/log.h @@ -14,5 +14,6 @@ void logMessage(int level, const char * s, ...) void openLog(int useLocal); void closeLog(void); void setLogLevel(int minLevel); +int getLogLevel(void); #endif /* _LOG_H_ */ diff --git a/loader2/net.c b/loader2/net.c index fb0d1febf..6b7596459 100644 --- a/loader2/net.c +++ b/loader2/net.c @@ -830,13 +830,19 @@ char *doDhcp(struct networkDeviceConfig *dev) { struct pumpNetIntf *i; char *r = NULL; time_t timeout = 45; + int loglevel; i = &dev->dev; + if (getLogLevel() == DEBUGLVL) + loglevel = LOG_DEBUG; + else + loglevel = LOG_INFO; + if (FL_NOIPV6(flags)) - r = pumpDhcpClassRun(i,0L,"anaconda",DHCPv6_DISABLE,0,timeout,netlogger,LOG_INFO); + r = pumpDhcpClassRun(i,0L,"anaconda",DHCPv6_DISABLE,0,timeout,netlogger,loglevel); else - r = pumpDhcpClassRun(i,0L,"anaconda",0,0,timeout,netlogger,LOG_INFO); + r = pumpDhcpClassRun(i,0L,"anaconda",0,0,timeout,netlogger,loglevel); return r; } |