diff --git a/21459-block-script.patch b/21459-block-script.patch new file mode 100644 index 0000000..b40a8dc --- /dev/null +++ b/21459-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/21460-xend-timeoffset.patch b/21460-xend-timeoffset.patch new file mode 100644 index 0000000..db16ac0 --- /dev/null +++ b/21460-xend-timeoffset.patch @@ -0,0 +1,25 @@ +# HG changeset patch +# User Jim Fehlig +# Date 1274822804 21600 +# Node ID a83e97657ba0f3ea232fe0dfb9edccf8e28aa982 +# Parent 14d040342c6618365750b2c3b96ca01ff4a5e5dd +tools: Fix time offset when localtime=0 + +localtime can be stored in vm config as a string, resulting in +incorrect calculation of rtc_timeoffset. Cast localtime to int +to ensure rtc_timeoffset is calculated properly. + + Signed-off-by: Jim Fehlig + +diff -r 14d040342c66 -r a83e97657ba0 tools/python/xen/xend/image.py +--- a/tools/python/xen/xend/image.py Tue May 25 11:13:22 2010 -0600 ++++ b/tools/python/xen/xend/image.py Tue May 25 15:26:44 2010 -0600 +@@ -129,7 +129,7 @@ + self.dmargs = self.parseDeviceModelArgs(vmConfig) + self.pid = None + rtc_timeoffset = int(vmConfig['platform'].get('rtc_timeoffset', 0)) +- if vmConfig['platform'].get('localtime', 0): ++ if int(vmConfig['platform'].get('localtime', 0)): + if time.localtime(time.time())[8]: + rtc_timeoffset -= time.altzone + else: diff --git a/xen.changes b/xen.changes index a9f03df..72b9b37 100644 --- a/xen.changes +++ b/xen.changes @@ -1,8 +1,28 @@ +------------------------------------------------------------------- +Tue May 25 15:17:38 MDT 2010 - carnold@novell.com + +- bnc#608191 - /var/adm/fillup-templates/sysconfig.xend from + package xen-tools is no valid sysconfig file + xend-sysconfig.patch + +------------------------------------------------------------------- +Tue May 25 14:32:57 MDT 2010 - carnold@novell.com + +- bnc#608194 - /etc/xen/* config files are not packaged with + noreplace + +------------------------------------------------------------------- +Tue May 25 13:19:17 MDT 2010 - carnold@novell.com + +- bnc#569744 - SLE HVM guest clock/timezone is incorrect after + reboot + 21460-xend-timeoffset.patch + ------------------------------------------------------------------- Tue May 25 11:20:30 MDT 2010 - jfehlig@novell.com - bnc#606882 - Allow spaces in vbd path names - block-script.patch + 21459-block-script.patch ------------------------------------------------------------------- Mon May 24 15:10:12 CST 2010 - jsong@novell.com @@ -12,7 +32,7 @@ Mon May 24 15:10:12 CST 2010 - jsong@novell.com ------------------------------------------------------------------- Wed May 19 13:23:36 MDT 2010 - carnold@novell.com -- bnc#607219 - AMD Erratum 383 workaround for Xen +- bnc#607219 - AMD Erratum 383 workaround for Xen 21408-amd-erratum-383.patch ------------------------------------------------------------------- diff --git a/xen.spec b/xen.spec index 968d6a0..3996d7f 100644 --- a/xen.spec +++ b/xen.spec @@ -103,7 +103,8 @@ 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 +Patch29: 21459-block-script.patch +Patch30: 21460-xend-timeoffset.patch # Our patches Patch300: xen-config.diff Patch301: xend-config.diff @@ -164,6 +165,7 @@ Patch366: cpu-pools-python.patch Patch367: cpu-pools-libxen.patch Patch368: cpu-pools-xmtest.patch Patch369: cpu-pools-docs.patch +Patch370: xend-sysconfig.patch # Patches for snapshot support Patch400: snapshot-ioemu-save.patch Patch401: snapshot-ioemu-restore.patch @@ -575,6 +577,7 @@ Authors: %patch27 -p1 %patch28 -p1 %patch29 -p1 +%patch30 -p1 %patch300 -p1 %patch301 -p1 %patch302 -p1 @@ -633,6 +636,7 @@ Authors: %patch367 -p1 %patch368 -p1 %patch369 -p1 +%patch370 -p1 %patch400 -p1 %patch401 -p1 %patch402 -p1 @@ -942,8 +946,8 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/xen/remus #/etc/xen/scripts/qemu-ifup /etc/xen/README* %config /etc/xen/vm -%config /etc/xen/*.sxp -%config /etc/xen/*.xml +%config(noreplace) /etc/xen/*.sxp +%config(noreplace) /etc/xen/*.xml %config(noreplace) /etc/xen/xenapiusers %config /etc/pam.d/xen-api %config /etc/modprobe.d/xen_loop.conf diff --git a/xend-sysconfig.patch b/xend-sysconfig.patch new file mode 100644 index 0000000..3a433c8 --- /dev/null +++ b/xend-sysconfig.patch @@ -0,0 +1,36 @@ +Index: xen-4.0.0-testing/tools/hotplug/Linux/init.d/sysconfig.xend +=================================================================== +--- xen-4.0.0-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xend ++++ xen-4.0.0-testing/tools/hotplug/Linux/init.d/sysconfig.xend +@@ -1,11 +1,27 @@ ++## Path: System/Virtualization ++## Type: string(none,guest,hv,all) ++## Default: "" ++# + # Log xenconsoled messages (cf xm dmesg) +-#XENCONSOLED_TRACE=[none|guest|hv|all] ++XENCONSOLED_TRACE="" + ++## Path: System/Virtualization ++## Type: string(yes,on,1) ++## Default: "" ++# + # Log xenstored messages +-#XENSTORED_TRACE=[yes|on|1] ++XENSTORED_TRACE="" + ++## Path: System/Virtualization ++## Type: string("/var/lib/xenstored") ++## Default: "" ++# + # Running xenstored on XENSTORED_ROOTDIR +-#XENSTORED_ROOTDIR=/var/lib/xenstored ++XENSTORED_ROOTDIR="" + ++## Path: System/Virtualization ++## Type: string(yes,on,1) ++## Default: "" ++# + # Running xenbackendd in debug mode +-#XENBACKENDD_DEBUG=[yes|on|1] ++XENBACKENDD_DEBUG=""