A recent change in GNU cut disallows use of a newline as a field
delimiter. Avoid the problematic use of cut in vif-bridge.
Signed-off-by: Bob Proulx <bob@proulx.com>
---
tools/hotplug/Linux/vif-bridge | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/hotplug/Linux/vif-bridge b/tools/hotplug/Linux/vif-bridge
index f489519..9a6f82a 100644
--- a/tools/hotplug/Linux/vif-bridge
+++ b/tools/hotplug/Linux/vif-bridge
@@ -37,8 +37,7 @@ bridge=$(xenstore_read_default "$XENBUS_PATH/bridge"
"$bridge")
if [ -z "$bridge" ]
then
- bridge=$(brctl show | cut -d "
-" -f 2 | cut -f 1)
+ bridge=$(brctl show | awk ''NR==2{print$1}'')
if [ -z "$bridge" ]
then
--
1.8.4.rc1
On Fri, 2013-08-09 at 01:18 -0600, Bob Proulx wrote:> A recent change in GNU cut disallows use of a newline as a field > delimiter. Avoid the problematic use of cut in vif-bridge. > > Signed-off-by: Bob Proulx <bob@proulx.com>Acked-by: Ian Campbell <ian.campbell@citrix.com> Both of the committers who generally deal with toolside stuff are away (at debconf) at the moment, but this is on my list to deal with when I get back. Cheers, Ian.> --- > tools/hotplug/Linux/vif-bridge | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/tools/hotplug/Linux/vif-bridge b/tools/hotplug/Linux/vif-bridge > index f489519..9a6f82a 100644 > --- a/tools/hotplug/Linux/vif-bridge > +++ b/tools/hotplug/Linux/vif-bridge > @@ -37,8 +37,7 @@ bridge=$(xenstore_read_default "$XENBUS_PATH/bridge" "$bridge") > > if [ -z "$bridge" ] > then > - bridge=$(brctl show | cut -d " > -" -f 2 | cut -f 1) > + bridge=$(brctl show | awk ''NR==2{print$1}'') > > if [ -z "$bridge" ] > then
On Tue, 2013-08-13 at 21:21 +0100, Ian Campbell wrote:> On Fri, 2013-08-09 at 01:18 -0600, Bob Proulx wrote: > > A recent change in GNU cut disallows use of a newline as a field > > delimiter. Avoid the problematic use of cut in vif-bridge. > > > > Signed-off-by: Bob Proulx <bob@proulx.com> > > Acked-by: Ian Campbell <ian.campbell@citrix.com>and applied... I also tagged #718898 fixed-upstream...