diff --git a/block-script.patch b/block-script.patch new file mode 100644 index 0000000..b40a8dc --- /dev/null +++ b/block-script.patch @@ -0,0 +1,27 @@ +# HG changeset patch +# User Jim Fehlig +# Date 1274807602 21600 +# Node ID 14d040342c6618365750b2c3b96ca01ff4a5e5dd +# Parent 93410e5e4ad8799932ad31820d0d82c74d1f63a2 +Allow space in vbd path name + +c/s 20393 breaks existing domain configuration that contains +spaces in the vbd path name. Fixed by this trivial patch which +provides missing quotes. + + Signed-off-by: Jim Fehlig + +diff -r 93410e5e4ad8 -r 14d040342c66 tools/hotplug/Linux/block +--- a/tools/hotplug/Linux/block Sat May 22 06:36:41 2010 +0100 ++++ b/tools/hotplug/Linux/block Tue May 25 11:13:22 2010 -0600 +@@ -272,8 +272,8 @@ + + if [ "x$mode" != 'x!' ] + then +- inode=$(stat -c '%i' $file) +- dev=$(stat -c '%D' $file) ++ inode=$(stat -c '%i' "$file") ++ dev=$(stat -c '%D' "$file") + if [ -z "$inode" ] || [ -z "$dev" ] + then + fatal "Unable to lookup $file: dev: $dev inode: $inode" diff --git a/xen.changes b/xen.changes index 367136b..a9f03df 100644 --- a/xen.changes +++ b/xen.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 25 11:20:30 MDT 2010 - jfehlig@novell.com + +- bnc#606882 - Allow spaces in vbd path names + block-script.patch + ------------------------------------------------------------------- Mon May 24 15:10:12 CST 2010 - jsong@novell.com - bnc#591799 - The status of Caps Lock is incorrect in domU diff --git a/xen.spec b/xen.spec index 174bafc..968d6a0 100644 --- a/xen.spec +++ b/xen.spec @@ -103,6 +103,7 @@ Patch25: 21360-x86-mce-polling-diabled-init.patch Patch26: 21372-x86-cross-cpu-wait.patch Patch27: 21373-dummy-domain-io-caps.patch Patch28: 21408-amd-erratum-383.patch +Patch29: block-script.patch # Our patches Patch300: xen-config.diff Patch301: xend-config.diff @@ -573,6 +574,7 @@ Authors: %patch26 -p1 %patch27 -p1 %patch28 -p1 +%patch29 -p1 %patch300 -p1 %patch301 -p1 %patch302 -p1