Hi,
Here's a patch fixing bashism in !/bin/sh scripts in xen-api. Please
apply this upstream as well.
Cheers,
Thomas
>From 175ba2a97bedfe160397290af216346755fab136 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <tho...@goirand.fr>
Date: Wed, 24 Oct 2012 04:37:13 +0000
Subject: [PATCH] Fixes 2 bashism.
---
debian/changelog | 4 +++-
.../patches/Fixes-bashism-in-interface-visualise.patch | 16 ++++++++++++++++
...ixes-bashism-in-ocaml-rt-install-debian-pv.sh.patch | 16 ++++++++++++++++
debian/patches/series | 2 ++
4 files changed, 37 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/Fixes-bashism-in-interface-visualise.patch
create mode 100644 debian/patches/Fixes-bashism-in-ocaml-rt-install-debian-pv.sh.patch
diff --git a/debian/changelog b/debian/changelog
index 38a55b5..5f1ee6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,14 @@
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 <z...@debian.org> Fri, 28 Sep 2012 18:32:46 +0000
+ -- Thomas Goirand <z...@debian.org> Wed, 24 Oct 2012 04:32:38 +0000
xen-api (1.3.2-11) unstable; urgency=high
diff --git a/debian/patches/Fixes-bashism-in-interface-visualise.patch b/debian/patches/Fixes-bashism-in-interface-visualise.patch
new file mode 100644
index 0000000..4312827
--- /dev/null
+++ b/debian/patches/Fixes-bashism-in-interface-visualise.patch
@@ -0,0 +1,16 @@
+Description: Fixes bashism in xen-api/scripts/interface-visualise
+Author: Thomas Goirand <z...@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 --git a/debian/patches/Fixes-bashism-in-ocaml-rt-install-debian-pv.sh.patch b/debian/patches/Fixes-bashism-in-ocaml-rt-install-debian-pv.sh.patch
new file mode 100644
index 0000000..10093fc
--- /dev/null
+++ b/debian/patches/Fixes-bashism-in-ocaml-rt-install-debian-pv.sh.patch
@@ -0,0 +1,16 @@
+Description: Fixes bashism in ocaml/xe-cli/rt/install-debian-pv.sh
+Author: Thomas Goirand <z...@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 --git a/debian/patches/series b/debian/patches/series
index 4e7a011..23f09ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -38,3 +38,5 @@ bug677395-remove-old-ip
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
--
1.7.10.4
