Re: [Xen-devel] [OSSTEST PATCH 1/3] ts-xen-install: nodhcp: Fix iface regexp

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Thu, 2014-04-17 at 16:13 +0100, Ian Jackson wrote:
> This regexp would never match because of the spurious $.  Remove the
> $ and also the preceding unnecessary \s*.
> 
> Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>

I've been running with this series in standalone mode on the system
which I initially had this trouble with and it seems to be doing the
right thing for both reused and freshly installed hosts.

Tested-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

> ---
>  ts-xen-install |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/ts-xen-install b/ts-xen-install
> index 4a810e4..70e90ed 100755
> --- a/ts-xen-install
> +++ b/ts-xen-install
> @@ -221,7 +221,7 @@ sub nodhcp () {
>               next unless
>                   m{^ \s* (  auto \s+ (\S+)               ) \s* $}x ||
>                   m{^ \s* (  allow-hotplug \s+ (\S+)      ) \s* $}x ||
> -                 m{^ \s* (  iface \s+ (\S+) \s+ inet \s+ ) \s* $}x ;
> +                 m{^ \s* (  iface \s+ (\S+) \s+ inet \s+ ) }x ;
>               push @{ $candidates{$2} }, $1;
>           }
>           EI->error and die $!;



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel