Bug#697281: unblock: xen-api/1.3.2-14 (Fixes #696810: bad debconf handling)

[Thomas Goirand <zigo@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Hi,

As per #696810, the debconf choice for the networking mode of
XCP wasn't working as expected. When using apt, even when choosing
bridging, openvswitch was always set in /etc/xcp/network.conf. This
-14 version fixes that. If that is enough explanations, you can skip
what is below (debdiff attached to this message).

<More explanation in details>
I was mainly testing using dpkg -i xcp-networkd*.deb. Using dpkg,
the debian/xcp-networkd.config script was executed only once. But
when using apt, it seems that debian/xcp-networkd.config was
executed once normally, and then once more in a non-interactive
mode. This is what created the problem, or rather, this what made
me wrongly think my script was right when testing it. Now, when
I look back into it, I feel the corrected script is much cleaner
the way it is now anyway.

Also, because we only have:
Recommends: openvswitch-switch, openvswitch-datapath-dkms

and not a strong Depends:, plus the fact that it seems that the
openvswitch mode is sometimes buggy, plus the fact that it is
required to reboot which doesn't always work because of the
networking setup which isn't easy (see README.Debian about it),
I have decided it was more reasonable to leave the bridging mode
as the default, rather than openvswitch. This -14 Debian release
therefore sets Linux standard bridging as the default networking
for XCP (eg: that's what will be setup in non-interactive Debconf
frontend, and that will be the default selected option in the
Debconf screen).

Note that I have tested the new xcp-networkd package using both
dpkg -i and apt (with a local file:// repo), and it's fine now.
</More explanation in details>

Please unblock xen-api/1.3.2-14.

Cheers,

Thomas Goirand (zigo)

P.S: I was unsure if #696810 deserved an RC severity, please
let me know your view on this, so that next time I know.

diff -Nru xen-api-1.3.2/debian/changelog xen-api-1.3.2/debian/changelog
--- xen-api-1.3.2/debian/changelog	2012-11-04 07:11:22.000000000 +0000
+++ xen-api-1.3.2/debian/changelog	2012-12-27 13:18:26.000000000 +0000
@@ -1,3 +1,10 @@
+xen-api (1.3.2-14) unstable; urgency=low
+
+  * Fixes: if apt-get was used to install xcp-networkd instead of dpkg -i, then
+  debconf value selected for network-type wasn't respected (Closes: #696810).
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 27 Dec 2012 13:05:06 +0000
+
 xen-api (1.3.2-13) unstable; urgency=low
 
   * Fixes: wait_for_xapi() function in init.d script doesn't work on slave
diff -Nru xen-api-1.3.2/debian/xcp-networkd.config xen-api-1.3.2/debian/xcp-networkd.config
--- xen-api-1.3.2/debian/xcp-networkd.config	2012-11-04 07:11:22.000000000 +0000
+++ xen-api-1.3.2/debian/xcp-networkd.config	2012-12-27 13:18:26.000000000 +0000
@@ -10,15 +10,15 @@
 # Get the values from the config file
 if [ -r /etc/xcp/network.conf ] ; then
 	NETWORK_TYPE=`cat /etc/xcp/network.conf`
-fi
 
-# This controls the default behavior, which here will be openvswitch.
-# Invert words bridge and openvswitch to change this.
-if ! [ "${NETWORK_TYPE}" = "bridge" ] ; then
-	NETWORK_TYPE="openvswitch"
-fi
+	# Make sure we have a working value
+	# (eg: bridge or openvswitch, and nothing else)
+	if ! [ "${NETWORK_TYPE}" = "bridge" ] ; then
+		NETWORK_TYPE="openvswitch"
+	fi
 
-db_set xcp-xapi/networking_type ${NETWORK_TYPE}
+	db_set xcp-xapi/networking_type ${NETWORK_TYPE}
+fi
 db_input high xcp-xapi/networking_type || true
 db_go