Bug#773535: release.debian.org: openvswitch-switch/2.3.0+git20140819-3
Package: release.debian.org
Severity: normal
Please unblock package openvswitch-switch
This release fixes an RC bug:
- Open vSwitch configuration through /etc/network/interfaces does not work
#771863
I chose to resolve this problem using the fix that has been
accepted upstream.
The new package does not make any other changes.
The debdiff is attached; it is not large.
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.14-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=ja_JP.utf8, LC_CTYPE=ja_JP.utf8 (charmap=UTF-8) (ignored: LC_ALL set to ja_JP.utf8)
Shell: /bin/sh linked to /bin/bash
diff -Nru openvswitch-2.3.0+git20140819/debian/changelog openvswitch-2.3.0+git20140819/debian/changelog
--- openvswitch-2.3.0+git20140819/debian/changelog 2014-08-21 00:35:32.000000000 +0900
+++ openvswitch-2.3.0+git20140819/debian/changelog 2014-12-19 12:32:53.000000000 +0900
@@ -1,3 +1,15 @@
+openvswitch (2.3.0+git20140819-3) unstable; urgency=medium
+
+ * Don't depened on $RUNLEVEL at startup to create bridges.
+ This should allow Open vSwitch configuration through
+ /etc/network/interfaces where $RUNLEVEL is not set.
+ This change is upstream commit 238324bd73b031635
+ ("debian: Don't depened on $RUNLEVEL at startup to create bridges.")
+ Closes: #771863
+ *
+
+ -- Simon Horman <horms@debian.org> Fri, 19 Dec 2014 10:54:08 +0900
+
openvswitch (2.3.0+git20140819-2) unstable; urgency=low
* debian/rules: Rerun checks on tests that fail the first time. Skip
diff -Nru openvswitch-2.3.0+git20140819/debian/openvswitch-switch.init openvswitch-2.3.0+git20140819/debian/openvswitch-switch.init
--- openvswitch-2.3.0+git20140819/debian/openvswitch-switch.init 2014-08-20 00:30:43.000000000 +0900
+++ openvswitch-2.3.0+git20140819/debian/openvswitch-switch.init 2014-12-19 11:18:44.000000000 +0900
@@ -31,7 +31,6 @@
test -e /etc/default/openvswitch-switch && . /etc/default/openvswitch-switch
network_interfaces () {
- [ -z "${RUNLEVEL}" ] && return
INTERFACES="/etc/network/interfaces"
[ -e "${INTERFACES}" ] || return
bridges=`awk '{ if ($1 == "allow-ovs") { print $2; } }' "${INTERFACES}"`
@@ -62,11 +61,13 @@
fi
set "$@" $OVS_CTL_OPTS
"$@" || exit $?
- [ "$2" = "start" ] && network_interfaces ifup
+ if [ "$2" = "start" ] && [ "$READ_INTERFACES" != "no" ]; then
+ network_interfaces ifup
+ fi
}
stop () {
- network_interfaces ifdown
+ [ "$READ_INTERFACES" != "no" ] && network_interfaces ifdown
ovs_ctl stop
}
@@ -101,8 +102,8 @@
start restart
fi
else
- stop
- start
+ READ_INTERFACES="no" stop
+ READ_INTERFACES="no" start
fi
}
Reply to: