scripts: Fix regression in VLAN interface support
authorMartin Schwenke <martin@meltin.net>
Tue, 7 Jul 2015 10:49:38 +0000 (20:49 +1000)
committerMartin Schwenke <martin@meltin.net>
Wed, 24 Feb 2016 10:44:28 +0000 (21:44 +1100)
commit3056f97aee3ce970c2190f1ca045dc5cf710eecb
tree3d2ccd124ebeffe2075f83d081effc314d823574
parentcc1017637bf16d412d75e03874c44b4a9d934cba
scripts: Fix regression in VLAN interface support

Commit 6471541d6d2bc9f2af0ff92b280abbd1d933cf88 broke support for VLAN
interfaces.  Releasing a public IP address depends on
ip_maskbits_iface() and for a VLAN interface this will return an
interface of the form <vlan>@<iface>, which can't be fed back into
"ip" commands.

Update ip_maskbits_iface() to drop the '@' and everything after it.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Reported-by: Jan Schwaratzki <jschwaratzki@ddn.com>
(Imported from commit 87c5c96b767aa317dd620f89ac3e11bb40dae70f)
config/functions