From 157e08a29c4b0a6b65c194c01105ee1939254ba1 Mon Sep 17 00:00:00 2001 From: rpe Date: Mon, 28 Jul 2014 05:42:26 +0000 Subject: [PATCH] Change detection of unconfigured vlan interfaces from using flags to looking for vlan id and parent interface. This avoids the creation of unconfigured vlan interface every time /install is restarted. Noted by and OK miod@ OK krw@ Positive feedback sthen@ claudio@ --- distrib/miniroot/install.sub | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index d15bf6369f3..e40fdd956ba 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.786 2014/07/22 17:01:33 deraadt Exp $ +# $OpenBSD: install.sub,v 1.787 2014/07/28 05:42:26 rpe Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback # All rights reserved. @@ -642,7 +642,7 @@ configure_ifs() { while :; do _vd=$(ifconfig vlan$_vl 2>&1) [[ $_vd == @(*no such interface*) ]] && break - [[ $_vd == @(vlan$_vl: flags=0<>*) ]] && break + [[ $_vd == @(*vlan: +([[:digit:]]) parent interface:*) ]] || break ((_vl++)) done _vd= -- 2.20.1