Files
xen/ignore-ip-command-script-errors.patch

53 lines
1.7 KiB
Diff
Raw Permalink Normal View History

References: bsc#1172356
The bug is that virt-manager reports a failure when in fact
the host and guest have added the network interface. The Xen
scripts are failing with an error when in fact that command
is succeeding.
The 'ip' commands seem to abort the script due to a 'set -e' in
xen-script-common.sh with what appears to be an error condition.
However, the command actually succeeds when checked from the
host console or also by inserting a sleep before each ip command
and executing it manually at the command line. This seems to be
an artifact of using 'set -e' everywhere.
---
tools/hotplug/Linux/xen-network-common.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/tools/hotplug/Linux/xen-network-common.sh
+++ b/tools/hotplug/Linux/xen-network-common.sh
@@ -84,7 +84,7 @@
local virtual="$2"
# take interface down ...
- ip link set dev ${dev} down
+ ip link set dev ${dev} down || true
if [ $virtual -ne 0 ] ; then
# Initialise a dummy MAC address. We choose the numerically
@@ -95,7 +95,7 @@
fi
# ... and configure it
- ip address flush dev ${dev}
+ ip address flush dev ${dev} || true
}
setup_physical_bridge_port() {
@@ -123,12 +123,12 @@
# Don't add $dev to $bridge if it's already on the bridge.
- Add xen.sysconfig-fillup.patch to make sure xencommons is in a format as expected by fillup. Each comment needs to be followed by an enabled key. Otherwise fillup will remove manually enabled key=value pairs, along with everything that looks like a stale comment, during next pkg update - Remove init.xen_loop and /etc/modprobe.d/xen_loop.conf The number of loop devices is unlimited since a while - Refresh xenstore-launch.patch to cover also daemon case - Now that SOURCE_DATE_EPOCH is defined and Xen Makefile uses it, drop reproducible.patch - Update to Xen 4.15.0 FCS release xen-4.15.0-testing-src.tar.bz2 * Xen can now export Intel Processor Trace (IPT) data from guests to tools in dom0. * Xen now supports Viridian enlightenments for guests with more than 64 vcpus. * Xenstored and oxenstored both now support LiveUpdate (tech preview). * Unified boot images * Switched x86 MSR accesses to deny by default policy. * Named PCI devices for xl/libxl and improved documentation for xl PCI configuration format. * Support for zstd-compressed dom0 (x86) and domU kernels. * Reduce ACPI verbosity by default. * Add ucode=allow-same option to test late microcode loading path. * Library improvements from NetBSD ports upstreamed. * x86: Allow domains to use AVX-VNNI instructions. * Added XEN_SCRIPT_DIR configuration option to specify location for Xen scripts. * xennet: Documented a way for the backend (or toolstack) to specify MTU to the frontend. * On detecting a host crash, some debug key handlers can automatically triggered to aid in debugging. OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=743
2021-05-04 14:51:11 +00:00
if [ ! -e "/sys/class/net/${bridge}/brif/${dev}" ]; then
log debug "adding $dev to bridge $bridge"
- ip link set ${dev} master ${bridge}
+ ip link set ${dev} master ${bridge} || true
else
- Add xen.sysconfig-fillup.patch to make sure xencommons is in a format as expected by fillup. Each comment needs to be followed by an enabled key. Otherwise fillup will remove manually enabled key=value pairs, along with everything that looks like a stale comment, during next pkg update - Remove init.xen_loop and /etc/modprobe.d/xen_loop.conf The number of loop devices is unlimited since a while - Refresh xenstore-launch.patch to cover also daemon case - Now that SOURCE_DATE_EPOCH is defined and Xen Makefile uses it, drop reproducible.patch - Update to Xen 4.15.0 FCS release xen-4.15.0-testing-src.tar.bz2 * Xen can now export Intel Processor Trace (IPT) data from guests to tools in dom0. * Xen now supports Viridian enlightenments for guests with more than 64 vcpus. * Xenstored and oxenstored both now support LiveUpdate (tech preview). * Unified boot images * Switched x86 MSR accesses to deny by default policy. * Named PCI devices for xl/libxl and improved documentation for xl PCI configuration format. * Support for zstd-compressed dom0 (x86) and domU kernels. * Reduce ACPI verbosity by default. * Add ucode=allow-same option to test late microcode loading path. * Library improvements from NetBSD ports upstreamed. * x86: Allow domains to use AVX-VNNI instructions. * Added XEN_SCRIPT_DIR configuration option to specify location for Xen scripts. * xennet: Documented a way for the backend (or toolstack) to specify MTU to the frontend. * On detecting a host crash, some debug key handlers can automatically triggered to aid in debugging. OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=743
2021-05-04 14:51:11 +00:00
log debug "$dev already on bridge $bridge"
fi
- Add xen.sysconfig-fillup.patch to make sure xencommons is in a format as expected by fillup. Each comment needs to be followed by an enabled key. Otherwise fillup will remove manually enabled key=value pairs, along with everything that looks like a stale comment, during next pkg update - Remove init.xen_loop and /etc/modprobe.d/xen_loop.conf The number of loop devices is unlimited since a while - Refresh xenstore-launch.patch to cover also daemon case - Now that SOURCE_DATE_EPOCH is defined and Xen Makefile uses it, drop reproducible.patch - Update to Xen 4.15.0 FCS release xen-4.15.0-testing-src.tar.bz2 * Xen can now export Intel Processor Trace (IPT) data from guests to tools in dom0. * Xen now supports Viridian enlightenments for guests with more than 64 vcpus. * Xenstored and oxenstored both now support LiveUpdate (tech preview). * Unified boot images * Switched x86 MSR accesses to deny by default policy. * Named PCI devices for xl/libxl and improved documentation for xl PCI configuration format. * Support for zstd-compressed dom0 (x86) and domU kernels. * Reduce ACPI verbosity by default. * Add ucode=allow-same option to test late microcode loading path. * Library improvements from NetBSD ports upstreamed. * x86: Allow domains to use AVX-VNNI instructions. * Added XEN_SCRIPT_DIR configuration option to specify location for Xen scripts. * xennet: Documented a way for the backend (or toolstack) to specify MTU to the frontend. * On detecting a host crash, some debug key handlers can automatically triggered to aid in debugging. OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=743
2021-05-04 14:51:11 +00:00
- ip link set dev ${dev} up
+ ip link set dev ${dev} up || true
}
- Add xen.sysconfig-fillup.patch to make sure xencommons is in a format as expected by fillup. Each comment needs to be followed by an enabled key. Otherwise fillup will remove manually enabled key=value pairs, along with everything that looks like a stale comment, during next pkg update - Remove init.xen_loop and /etc/modprobe.d/xen_loop.conf The number of loop devices is unlimited since a while - Refresh xenstore-launch.patch to cover also daemon case - Now that SOURCE_DATE_EPOCH is defined and Xen Makefile uses it, drop reproducible.patch - Update to Xen 4.15.0 FCS release xen-4.15.0-testing-src.tar.bz2 * Xen can now export Intel Processor Trace (IPT) data from guests to tools in dom0. * Xen now supports Viridian enlightenments for guests with more than 64 vcpus. * Xenstored and oxenstored both now support LiveUpdate (tech preview). * Unified boot images * Switched x86 MSR accesses to deny by default policy. * Named PCI devices for xl/libxl and improved documentation for xl PCI configuration format. * Support for zstd-compressed dom0 (x86) and domU kernels. * Reduce ACPI verbosity by default. * Add ucode=allow-same option to test late microcode loading path. * Library improvements from NetBSD ports upstreamed. * x86: Allow domains to use AVX-VNNI instructions. * Added XEN_SCRIPT_DIR configuration option to specify location for Xen scripts. * xennet: Documented a way for the backend (or toolstack) to specify MTU to the frontend. * On detecting a host crash, some debug key handlers can automatically triggered to aid in debugging. OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=743
2021-05-04 14:51:11 +00:00
remove_from_bridge () {