- bnc#783847 - Virtualization/xen: Bug Xen 4.2 'xendomins' init
script incorrectly Requires 'xend' service when using 'xl' toolstack init.xendomains OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=209
This commit is contained in:
Charles Arnold
Git OBS Bridge
parent
e28f3504fe
commit
75388748a2
43
26018-pygrub_correct_typo_in_--args_assignment.patch
Normal file
43
26018-pygrub_correct_typo_in_--args_assignment.patch
Normal file
@ -0,0 +1,43 @@
|
||||
changeset: 26018:ecc7627ca6d7
|
||||
tag: tip
|
||||
user: Olaf Hering <olaf@aepfle.de>
|
||||
date: Tue Oct 09 09:18:42 2012 +0100
|
||||
files: tools/pygrub/src/pygrub
|
||||
description:
|
||||
pygrub: correct typo in --args assignment
|
||||
|
||||
If pygrub was called with --args="some thing", then this string should
|
||||
be append to the kernel command line. But the last changeset
|
||||
25941:795c493fe561 contained a typo, it assigns 'args' instead of 'arg'.
|
||||
|
||||
Rename the local variable which holds the string from the domain config
|
||||
file to avoid further confusion.
|
||||
|
||||
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
||||
Acked-by: Ian Campbell <ian.campbell@citrix.com>
|
||||
Committed-by: Ian Campbell <ian.campbell@citrix.com>
|
||||
|
||||
|
||||
diff -r c9f621893a05 -r ecc7627ca6d7 tools/pygrub/src/pygrub
|
||||
--- a/tools/pygrub/src/pygrub Mon Oct 08 14:36:31 2012 +0100
|
||||
+++ b/tools/pygrub/src/pygrub Tue Oct 09 09:18:42 2012 +0100
|
||||
@@ -585,7 +585,7 @@ def get_entry_idx(cf, entry):
|
||||
|
||||
return None
|
||||
|
||||
-def run_grub(file, entry, fs, arg):
|
||||
+def run_grub(file, entry, fs, cfg_args):
|
||||
global g
|
||||
global sel
|
||||
|
||||
@@ -622,8 +622,8 @@ def run_grub(file, entry, fs, arg):
|
||||
grubcfg["ramdisk"] = img.initrd[1]
|
||||
if img.args:
|
||||
grubcfg["args"] += img.args
|
||||
- if arg:
|
||||
- grubcfg["args"] += " " + args
|
||||
+ if cfg_args:
|
||||
+ grubcfg["args"] += " " + cfg_args
|
||||
|
||||
return grubcfg
|
||||
|
||||
@ -7,10 +7,10 @@
|
||||
#
|
||||
### BEGIN INIT INFO
|
||||
# Provides: xendomains
|
||||
# Required-Start: $syslog $remote_fs xend
|
||||
# Should-Start: iscsi o2cb ocfs2
|
||||
# Required-Stop: $syslog $remote_fs xend
|
||||
# Should-Stop: iscsi
|
||||
# Required-Start: $syslog $remote_fs xenstored xenconsoled
|
||||
# Should-Start: xend iscsi o2cb ocfs2
|
||||
# Required-Stop: $syslog $remote_fs xenstored xenconsoled
|
||||
# Should-Stop: xend iscsi
|
||||
# Default-Start: 3 5
|
||||
# Default-Stop: 0 1 2 6
|
||||
# Short-Description: Starts and stops Xen VMs
|
||||
@ -21,11 +21,26 @@
|
||||
. /etc/rc.status
|
||||
rc_reset
|
||||
|
||||
LOCKFILE=/var/lock/subsys/xendomains
|
||||
XENDOM_CONFIG=/etc/sysconfig/xendomains
|
||||
RETCODE_FILE=/tmp/xendomains.rc.$$
|
||||
xm_cmd=echo
|
||||
|
||||
# See docs/misc/distro_mapping.txt
|
||||
if [ -d /var/lock/subsys ]; then
|
||||
LOCKFILE=/var/lock/subsys/xendomains
|
||||
else
|
||||
LOCKFILE=/var/lock/xendomains
|
||||
fi
|
||||
|
||||
if [ -d /etc/sysconfig ]; then
|
||||
XENDOM_CONFIG=/etc/sysconfig/xendomains
|
||||
else
|
||||
XENDOM_CONFIG=/etc/default/xendomains
|
||||
fi
|
||||
|
||||
test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing";
|
||||
if [ "$1" = "stop" ]; then exit 0;
|
||||
else exit 6; fi; }
|
||||
|
||||
. "$XENDOM_CONFIG"
|
||||
|
||||
shopt -s dotglob nullglob
|
||||
@ -59,13 +74,14 @@ check()
|
||||
XEND=`pidof -x /usr/sbin/xend`
|
||||
if [ -z "$XEND" ]; then
|
||||
xm_cmd="xl -f"
|
||||
XEND="xl"
|
||||
else
|
||||
xm_cmd="xm"
|
||||
fi
|
||||
if [ "$1" = status ]; then
|
||||
if [ ! -e /proc/xen/capabilities ] || [ ! -r "$XENDOM_CONFIG" ] || [ -z "$XEND" ]; then
|
||||
xendomains_abort 3
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if [ `id -u` != 0 ]; then
|
||||
xendomains_abort 4
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
Index: xen-4.2.0-testing/tools/pygrub/src/pygrub
|
||||
===================================================================
|
||||
--- xen-4.2.0-testing.orig/tools/pygrub/src/pygrub
|
||||
+++ xen-4.2.0-testing/tools/pygrub/src/pygrub
|
||||
@@ -623,7 +623,7 @@ def run_grub(file, entry, fs, arg):
|
||||
if img.args:
|
||||
grubcfg["args"] += img.args
|
||||
if arg:
|
||||
- grubcfg["args"] += " " + args
|
||||
+ grubcfg["args"] += " " + arg
|
||||
|
||||
return grubcfg
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 9 06:19:55 MDT 2012 - carnold@novell.com
|
||||
|
||||
- bnc#783847 - Virtualization/xen: Bug Xen 4.2 'xendomins' init
|
||||
script incorrectly Requires 'xend' service when using 'xl'
|
||||
toolstack
|
||||
init.xendomains
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 8 07:53:24 MDT 2012 - carnold@novell.com
|
||||
|
||||
|
||||
4
xen.spec
4
xen.spec
@ -200,6 +200,7 @@ Patch26008: 26008-xend-pvscsi_fix_passing_of_SCSI_control_LUNs.patch
|
||||
Patch26009: 26009-xend-pvscsi_fix_usage_of_persistant_device_names_for_SCSI_devices.patch
|
||||
Patch26010: 26010-xend-pvscsi_update_sysfs_parser_for_Linux_3.0.patch
|
||||
Patch26011: 26011-stubdom_fix_parallel_build_by_expanding_CROSS_MAKE.patch
|
||||
Patch26018: 26018-pygrub_correct_typo_in_--args_assignment.patch
|
||||
# Upstream qemu patches
|
||||
# Our patches
|
||||
Patch301: xend-config.diff
|
||||
@ -250,7 +251,6 @@ Patch379: xend-migration-domname-fix.patch
|
||||
Patch380: xm-create-maxmem.patch
|
||||
Patch381: vif-bridge-tap-fix.patch
|
||||
Patch382: xend-cpuid.patch
|
||||
Patch383: xen-pygrub-grub-args.patch
|
||||
# ioemu part of blktap patch series
|
||||
Patch410: ioemu-blktap-fv-init.patch
|
||||
Patch411: ioemu-blktap-image-format.patch
|
||||
@ -687,6 +687,7 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
|
||||
%patch26009 -p1
|
||||
%patch26010 -p1
|
||||
%patch26011 -p1
|
||||
%patch26018 -p1
|
||||
# Qemu
|
||||
# Our patches
|
||||
%patch301 -p1
|
||||
@ -736,7 +737,6 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
|
||||
%patch380 -p1
|
||||
%patch381 -p1
|
||||
%patch382 -p1
|
||||
%patch383 -p1
|
||||
%patch410 -p1
|
||||
%patch411 -p1
|
||||
%patch412 -p1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user