Upload of fixes for xen-api
Dear release team,
I would like update the Wheezy package of xen-api with numerous small
fixes. These aren't RC bugs, but I believe they are all worth fixing. I
believe that the most important one to fix is #682202.
Here's the changelog:
* Fixes bashism in install-debian-pv.sh (Closes: #690612).
* Fixes bashism in interface-visualise (Closes: #690710).
* The /etc/init.d/xcp-squeezed script now depends on /etc/init.d/xen
since it has been renamed like this from xend. For this reason,
xcp-squeezed now depends on xen-utils-common (>= 4.1.3-3) (Closes: #682202).
* Downgrades openvswitch dependencies to Recommends: (Closes: #686779).
* Few corrections in the README.Debian (Closes: #682122, #682120).
If I upload xen-api to SID, will the release team accept to unblock the
package so that it migrates to Wheezy? If not, please let me know which
of the above fixes isn't acceptable.
Cheers,
Thomas Goirand (zigo)
diff -Nru xen-api-1.3.2/debian/changelog xen-api-1.3.2/debian/changelog
--- xen-api-1.3.2/debian/changelog 2012-08-29 06:29:39.000000000 +0000
+++ xen-api-1.3.2/debian/changelog 2012-10-24 04:37:13.000000000 +0000
@@ -1,3 +1,15 @@
+xen-api (1.3.2-12) unstable; urgency=low
+
+ * Fixes bashism in install-debian-pv.sh (Closes: #690612).
+ * Fixes bashism in interface-visualise (Closes: #690710).
+ * The /etc/init.d/xcp-squeezed script now depends on /etc/init.d/xen since it
+ has been renamed like this from xend. For this reason, xcp-squeezed now
+ depends on xen-utils-common (>= 4.1.3-3) (Closes: #682202).
+ * Downgrades openvswitch dependencies to Recommends: (Closes: #686779).
+ * Few corrections in the README.Debian (Closes: #682122, #682120).
+
+ -- Thomas Goirand <zigo@debian.org> Wed, 24 Oct 2012 04:32:38 +0000
+
xen-api (1.3.2-11) unstable; urgency=high
* Fix PAM settings to only allow root to issue remote commands (LP: #1033899)
diff -Nru xen-api-1.3.2/debian/control xen-api-1.3.2/debian/control
--- xen-api-1.3.2/debian/control 2012-08-29 06:29:39.000000000 +0000
+++ xen-api-1.3.2/debian/control 2012-10-24 04:37:13.000000000 +0000
@@ -62,7 +62,7 @@
Package: xcp-squeezed
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, xen-hypervisor-4.1-amd64 | xen-hypervisor-4.1-i386 | xen-hypervisor-4.1, xen-utils-common
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, xen-hypervisor-4.1-amd64 | xen-hypervisor-4.1-i386 | xen-hypervisor-4.1, xen-utils-common (>= 4.1.3-3)
Description: Xen Cloud Platform - memory ballooning daemon
The Xen Cloud Platform (XCP) is a server virtualization and cloud
computing platform, with support for a range of guest operating systems,
@@ -183,7 +183,8 @@
Package: xcp-networkd
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, debconf, ethtool, bridge-utils, iproute, isc-dhcp-client, procps, openvswitch-switch, module-init-tools, openvswitch-datapath-dkms
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, debconf, ethtool, bridge-utils, iproute, isc-dhcp-client, procps, module-init-tools
+Recommends: openvswitch-switch, openvswitch-datapath-dkms
Description: Xen Cloud Platform - network configuration daemon
The Xen Cloud Platform (XCP) is a server virtualization and cloud
computing platform, with support for a range of guest operating systems,
diff -Nru xen-api-1.3.2/debian/patches/Fixes-bashism-in-interface-visualise.patch xen-api-1.3.2/debian/patches/Fixes-bashism-in-interface-visualise.patch
--- xen-api-1.3.2/debian/patches/Fixes-bashism-in-interface-visualise.patch 1970-01-01 00:00:00.000000000 +0000
+++ xen-api-1.3.2/debian/patches/Fixes-bashism-in-interface-visualise.patch 2012-10-24 04:37:13.000000000 +0000
@@ -0,0 +1,16 @@
+Description: Fixes bashism in xen-api/scripts/interface-visualise
+Author: Thomas Goirand <zigo@debian.org>
+Bug-Debian: http://bugs.debian.org/690710
+Forwarded: Sent upstream by email
+
+--- xen-api-1.3.2.orig/scripts/interface-visualise
++++ xen-api-1.3.2/scripts/interface-visualise
+@@ -16,7 +16,7 @@ for i in ${1:-/etc/sysconfig/network-scr
+
+ echo "$i" 1>&2
+ (
+- source "$i"
++ . "$i"
+ if [ X"${XEMANAGED}" = "Xyes" ] ; then
+ XEMANAGED="\nXE"
+ fi
diff -Nru xen-api-1.3.2/debian/patches/Fixes-bashism-in-ocaml-rt-install-debian-pv.sh.patch xen-api-1.3.2/debian/patches/Fixes-bashism-in-ocaml-rt-install-debian-pv.sh.patch
--- xen-api-1.3.2/debian/patches/Fixes-bashism-in-ocaml-rt-install-debian-pv.sh.patch 1970-01-01 00:00:00.000000000 +0000
+++ xen-api-1.3.2/debian/patches/Fixes-bashism-in-ocaml-rt-install-debian-pv.sh.patch 2012-10-24 04:37:13.000000000 +0000
@@ -0,0 +1,16 @@
+Description: Fixes bashism in ocaml/xe-cli/rt/install-debian-pv.sh
+Author: Thomas Goirand <zigo@debian.org>
+Bug-Debian: http://bugs.debian.org/690612
+Forwarded: Sent to upstream by email
+
+--- xen-api-1.3.2.orig/ocaml/xe-cli/rt/install-debian-pv.sh
++++ xen-api-1.3.2/ocaml/xe-cli/rt/install-debian-pv.sh
+@@ -32,7 +32,7 @@ HOST=`xe host-list hostname=${HOSTNAME}
+ # Check the SR is visible from here
+ NUMPBDS=`xe pbd-list sr-uuid=${SRUUID} host=${HOST} --minimal | wc -w`
+
+-if [ "${NUMPBDS}" == "0" ]; then
++if [ "${NUMPBDS}" = "0" ]; then
+ echo "Cannot see requested storage from this host!"
+ exit 1
+ fi
diff -Nru xen-api-1.3.2/debian/patches/series xen-api-1.3.2/debian/patches/series
--- xen-api-1.3.2/debian/patches/series 2012-08-29 06:29:39.000000000 +0000
+++ xen-api-1.3.2/debian/patches/series 2012-10-24 04:37:13.000000000 +0000
@@ -38,3 +38,5 @@
write-dom0-xenstore-keys-on-startup.patch
bug680102-pool-eject
pam-auth-root-xapi-group
+Fixes-bashism-in-ocaml-rt-install-debian-pv.sh.patch
+Fixes-bashism-in-interface-visualise.patch
diff -Nru xen-api-1.3.2/debian/README.Debian xen-api-1.3.2/debian/README.Debian
--- xen-api-1.3.2/debian/README.Debian 2012-08-29 06:29:39.000000000 +0000
+++ xen-api-1.3.2/debian/README.Debian 2012-10-24 04:37:13.000000000 +0000
@@ -99,7 +99,7 @@
--------------------------
4.1/ Switch using xapi instead of xm and xend to control Xen
As of writing, you should do that:
-sed -i "s/TOOLSTACK=/TOOLSTACK=xapi/" /etc/default/xen
+sed -i "s/TOOLSTACK=.*/TOOLSTACK=xapi/" /etc/default/xen
It is later planned to change this in Debian with 3 switches: xm, xl and xe.
Since this is not yet implemented, please refer to the /etc/default/xen
@@ -146,7 +146,7 @@
/etc/xcp/network.conf contains "openvswitch" and not "bridge), then you should
tell XCP about your network configuration:
-PIF_UUID=`xe pif-list device=eth0`
+PIF_UUID=`xe pif-list device=eth0 --minimal`
xe pif-reconfigure-ip uuid=$PIF_UUID mode=static \
IP=1.2.3.4 netmask=255.255.255.0 gateway=1.2.3.1
@@ -170,9 +170,15 @@
INSTALLATION_UUID='7f4f3149-2e9d-7bb5-bb99-fd51420a8cd6'
4.3/ Set Xen as default in GRUB
+Hackish way:
cd /etc/grub.d
mv 10_linux 25_linux
+Or using a more definitive way:
+dpkg-divert --divert /etc/grub.d/08_linux_xen --rename /etc/grub.d/20_linux_xen
+
+Then set reasonable defaults for the dom0 RAM, and boot only from Xen:
+
echo "
# Start dom0 with less RAM
GRUB_CMDLINE_XEN_DEFAULT=\"dom0_mem=1024M\"
diff -Nru xen-api-1.3.2/debian/xcp-squeezed.init xen-api-1.3.2/debian/xcp-squeezed.init
--- xen-api-1.3.2/debian/xcp-squeezed.init 2012-08-29 06:29:39.000000000 +0000
+++ xen-api-1.3.2/debian/xcp-squeezed.init 2012-10-24 04:37:13.000000000 +0000
@@ -1,7 +1,7 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: xcp-squeezed
-# Required-Start: $remote_fs $syslog xend
+# Required-Start: $remote_fs $syslog xen
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
Reply to: