--- lib/PXElator/dhcpd.pm 2009/08/06 18:09:17 160 +++ lib/PXElator/dhcpd.pm 2009/08/06 20:14:43 167 @@ -145,18 +145,26 @@ }; my @requested = split(/\s/, $dhcp->getOptionValue(DHO_DHCP_PARAMETER_REQUEST_LIST)); - warn "options ",dump( $options ), ' requested: ',dump( @requested ); + warn "options ",dump( $options ), ' requested: ',dump( @requested ) if $debug; + + my @missing; foreach ( @requested ) { - $packet->{$_} = $options->{$_} if defined $options->{$_}; + if ( defined $options->{$_} ) { + $packet->{$_} = $options->{$_}; + } else { + push @missing, $_; + } } + warn "W: options requested but missing: ",dump( @missing ); + foreach my $opt ( 'magic', 'config_file', 'path_prefix', 'reboot_time' ) { my $DH0 = eval 'DHO_PXELINUX_' . uc $opt; warn "DH0: $@" if $@; my $v = eval "\$pxelinux::$opt"; warn "v: $@" if $@; next unless defined $v; - warn "pxelinux dhcp option $opt = $DH0 = $v"; + warn "pxelinux dhcp option $opt = $DH0 = $v\n" if $debug; $packet->{ $DH0 } = $v; } @@ -183,8 +191,6 @@ log::mac $mac, "$messagetype igored (bootp?)"; } - warn "packet ",dump( $packet ); - warn ">> $mac == $ip server: $server::ip", $file ? " file: $file\n" : "\n" if $debug; $packet = new Net::DHCP::Packet( %$packet );