- Upstream bug fixes from Jan

21089-x86-startup-irq-from-setup-gsi.patch
  21109-x86-cpu-hotplug.patch
  21150-shadow-race.patch
  21160-sysctl-debug-keys.patch

- Updated to Xen 4.0.0 FCS, changeset 21091

- Change default lock dir (when domain locking is enabled) to
  /var/lib/xen/images/vm_locks
- Support SXP config files in xendomains script

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=39

init.xendomains

@@ -8,7 +8,7 @@
 ### BEGIN INIT INFO
 # Provides:          xendomains
 # Required-Start:    $syslog $remote_fs xend
-# Should-Start:      iscsi o2cb ocfs2
+# Should-Start:      iscsi o2cb ocfs2 openais
 # Required-Stop:     $syslog $remote_fs xend
 # Should-Stop:       iscsi
 # Default-Start:     3 5
@@ -89,7 +89,11 @@ dir_contains_something()
 
 get_name_from_cfg()
 {
-	NM=`grep '^name[	 ]*=' "$1" | sed -e 's/^name[	 ]*=[	 ]*['\''"]\([^'\''"]*\)['\''"].*$/\1/'`
+	if grep -q "^name" "$1";then
+		NM=`grep '^name[	 ]*=' "$1" | sed -e 's/^name[	 ]*=[	 ]*['\''"]\([^'\''"]*\)['\''"].*$/\1/'`
+	elif grep -q "(name " "$1";then
+		NM=`grep '(name ' "$1" | sed -e 's/^ *//' | cut -d " " -f 2 | sed -e 's/)//'`
+	fi
 }
 
 running_auto_names()
@@ -179,12 +183,16 @@ start()
 			if is_cfg_running "$dom"; then
 				rc_status -s
 			else
-				xm create --quiet --defconfig "$dom"
+				if grep -q "^name" "$dom";then
+					xm create --quiet --defconfig "$dom"
+				elif grep -q "(name .*" "$dom";then
+					xm create --quiet --config "$dom"
+				fi
 				if [ $? -ne 0 ]; then
-					rc_failed
+				    rc_failed
 				else
-					usleep $XENDOMAINS_CREATE_USLEEP
-					rc_reset
+				    usleep $XENDOMAINS_CREATE_USLEEP
+				    rc_reset
 				fi
 				rc_status -v
 			fi