> -----Original Message----- > From: Jan Beulich <jbeul...@suse.com> > Sent: 02 September 2020 07:09 > To: xen-devel@lists.xenproject.org > Cc: Ian Jackson <i...@xenproject.org>; Wei Liu <w...@xen.org>; Paul Durrant > <p...@xen.org> > Subject: [PATCH v2] tools/hotplug/Linux: don't needlessly use non-standard > features in vif- > {bridge,route} > > We're not after any "fall-through" behavior here. Replace the constructs > with ones understood by all conforming shells, including older bash > (problem observed with 3.1.51(1)). > > Fixes: b51715f02bf9 ("tools/hotplug/Linux: remove code duplication in > vif-bridge") > Fixes: 3683290fc0b0 ("tools/hotplug: only attempt to call 'ip route' if there > is valid command") > Signed-off-by: Jan Beulich <jbeul...@suse.com>
Reviewed-by: Paul Durrant <p...@xen.org> > --- > v2: Also adjust vif-route. > > --- a/tools/hotplug/Linux/vif-bridge > +++ b/tools/hotplug/Linux/vif-bridge > @@ -77,16 +77,12 @@ then > fi > > case "$command" in > - add) > - ;& > - online) > + add|online) > setup_virtual_bridge_port "$dev" > set_mtu "$bridge" "$dev" "$type_if" > add_to_bridge "$bridge" "$dev" > ;; > - remove) > - ;& > - offline) > + remove|offline) > remove_from_bridge "$bridge" "$dev" > ;; > esac > --- a/tools/hotplug/Linux/vif-route > +++ b/tools/hotplug/Linux/vif-route > @@ -22,17 +22,13 @@ dir=$(dirname "$0") > main_ip=$(dom0_ip) > > case "${command}" in > - add) > - ;& > - online) > + add|online) > ifconfig ${dev} ${main_ip} netmask 255.255.255.255 up > echo 1 >/proc/sys/net/ipv4/conf/${dev}/proxy_arp > ipcmd='add' > cmdprefix='' > ;; > - remove) > - ;& > - offline) > + remove|offline) > do_without_error ifdown ${dev} > ipcmd='del' > cmdprefix='do_without_error'