Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Dear release team,
As Simon Horman, the last uploader of openvswitch, wrote that he would like
some assistance, I'm writing this unblock requests on his behalf.
The latest upload of openvswitch fixes RC bug #771863:
"Service does not start or parse interfaces correctly".
The debdiff (attached to this message) is very small, and deals only with
the init script.
Please unblock openvswitch/2.3.0+git20140819-3
Cheers,
Thomas Goirand (zigo)
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-20 15:35:32.000000000 +0000
+++ openvswitch-2.3.0+git20140819/debian/changelog 2014-12-19 03:32:53.000000000 +0000
@@ -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 <ho...@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-19 15:30:43.000000000 +0000
+++ openvswitch-2.3.0+git20140819/debian/openvswitch-switch.init 2014-12-19 02:18:44.000000000 +0000
@@ -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
}
