[pve-devel] [PATCH] INotify.pm: Correct read_etc_resolv_conf search filter

Dietmar Maurer dietmar at proxmox.com
Fri Mar 8 11:31:18 CET 2013


I just re-read 'man resolv.conf', and I think we should not merge
'domain' and 'search', and return both values instead?

> diff --git a/data/PVE/INotify.pm b/data/PVE/INotify.pm index
> 850668a..0d871d9 100644
> --- a/data/PVE/INotify.pm
> +++ b/data/PVE/INotify.pm
> @@ -536,7 +536,7 @@ sub read_etc_resolv_conf {
>      my $nscount = 0;
>      while (my $line = <$fh>) {
>  	chomp $line;
> -	if ($line =~ m/^(search|domain)\s+(\S+)\s*/) {
> +	if ($line =~ m/^(search|domain)\s+(.+)/) {
>  	    $res->{search} = $2;
>  	} elsif ($line =~
> m/^nameserver\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s*/) {
>  	    $nscount++;
> --
> 1.7.10.4



More information about the pve-devel mailing list