From: Paul Durrant <pdurr...@amazon.com> configuration is not parsed by libxl so there is no reason for the hotplug script to exist
Signed-off-by: Paul Durrant <pdurr...@amazon.com> --- Cc: Ian Jackson <ian.jack...@eu.citrix.com> Cc: Wei Liu <w...@xen.org> v3: - New in v3 --- tools/hotplug/Linux/Makefile | 1 - tools/hotplug/Linux/vif2 | 54 ------------------------------------ 2 files changed, 55 deletions(-) delete mode 100644 tools/hotplug/Linux/vif2 diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index 3a90990594..0b1d111d7e 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -6,7 +6,6 @@ XEN_SCRIPTS = vif-bridge XEN_SCRIPTS += vif-route XEN_SCRIPTS += vif-nat XEN_SCRIPTS += vif-openvswitch -XEN_SCRIPTS += vif2 XEN_SCRIPTS += vif-setup XEN_SCRIPTS-$(CONFIG_LIBNL) += remus-netbuf-setup XEN_SCRIPTS += block diff --git a/tools/hotplug/Linux/vif2 b/tools/hotplug/Linux/vif2 deleted file mode 100644 index 5bd555c6f0..0000000000 --- a/tools/hotplug/Linux/vif2 +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -dir=$(dirname "$0") -. "$dir/xen-hotplug-common.sh" -. "$dir/xen-network-common.sh" - -bridge=$(xenstore_read_default "$XENBUS_PATH/bridge" "$bridge") -if [ -z "$bridge" ] - then - if which brctl >&/dev/null; then - nr_bridges=$(($(brctl show | cut -f 1 | grep -v "^$" | wc -l) - 1)) - else - nr_bridges=$(bridge link | wc -l) - fi - if [ "$nr_bridges" != 1 ] - then - fatal "no bridge specified, and don't know which one to use ($nr_bridges found)" - fi - if which brctl >&/dev/null; then - bridge=$(brctl show | cut -d " -" -f 2 | cut -f 1) - else - bridge=$(bridge link | cut -d" " -f6) - fi -fi - -command="$1" -shift - -case "$command" in - "online") - if [ "$bridge" != "-" ] - then - setup_virtual_bridge_port "$vif" - add_to_bridge "$bridge" "$vif" - else - # Just let the normal udev rules for interfaces handle it. - true - fi - success - ;; - - "add") - success - ;; - - "remove") - ;; - - *) - echo "Unknown command: $command" - echo 'Valid commands are: add, remove, online' - exit 1 -esac -- 2.20.1
