forked from SLFO-pool/xen
55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
|
References: fate#323663 - Run Xenstore in stubdomain
|
||
|
|
|
||
|
|
--- a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in
|
||
|
|
+++ b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in
|
||
|
|
@@ -8,7 +8,7 @@
|
||
|
|
XENCONSOLED_TRACE=
|
||
|
|
|
||
|
|
## Type: string
|
||
|
|
-## Default: daemon
|
||
|
|
+## Default: domain
|
||
|
|
#
|
||
|
|
# Select type of xentore service.
|
||
|
|
#
|
||
|
|
@@ -81,14 +81,14 @@ XENSTORED_TRACE=
|
||
|
|
XENSTORE_DOMAIN_KERNEL=
|
||
|
|
|
||
|
|
## Type: integer
|
||
|
|
-## Default: 8
|
||
|
|
+## Default: 32
|
||
|
|
#
|
||
|
|
# xenstore domain memory size in MiB.
|
||
|
|
# Only evaluated if XENSTORETYPE is "domain".
|
||
|
|
XENSTORE_DOMAIN_SIZE=
|
||
|
|
|
||
|
|
## Type: string
|
||
|
|
-## Default: not set, no autoballooning of xenstore domain
|
||
|
|
+## Default: 1/100
|
||
|
|
#
|
||
|
|
# Maximum xenstore domain memory size. Can be specified as:
|
||
|
|
# - plain integer value for max size in MiB
|
||
|
|
--- a/tools/hotplug/Linux/launch-xenstore.in
|
||
|
|
+++ b/tools/hotplug/Linux/launch-xenstore.in
|
||
|
|
@@ -48,7 +48,7 @@ test_xenstore && exit 0
|
||
|
|
|
||
|
|
test -f @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons && . @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons
|
||
|
|
|
||
|
|
-[ "$XENSTORETYPE" = "" ] && XENSTORETYPE=daemon
|
||
|
|
+[ "$XENSTORETYPE" = "" ] && XENSTORETYPE=domain
|
||
|
|
|
||
|
|
/bin/mkdir -p @XEN_RUN_DIR@
|
||
|
|
|
||
|
|
@@ -95,9 +95,10 @@ test -f @CONFIG_DIR@/@CONFIG_LEAF_DIR@/x
|
||
|
|
[ "$XENSTORETYPE" = "domain" ] && {
|
||
|
|
[ -z "$XENSTORE_DOMAIN_KERNEL" ] && XENSTORE_DOMAIN_KERNEL=@LIBEXEC@/boot/xenstore-stubdom.gz
|
||
|
|
XENSTORE_DOMAIN_ARGS="$XENSTORE_DOMAIN_ARGS --kernel $XENSTORE_DOMAIN_KERNEL"
|
||
|
|
- [ -z "$XENSTORE_DOMAIN_SIZE" ] && XENSTORE_DOMAIN_SIZE=8
|
||
|
|
+ [ -z "$XENSTORE_DOMAIN_SIZE" ] && XENSTORE_DOMAIN_SIZE=32
|
||
|
|
XENSTORE_DOMAIN_ARGS="$XENSTORE_DOMAIN_ARGS --memory $XENSTORE_DOMAIN_SIZE"
|
||
|
|
- [ -z "$XENSTORE_MAX_DOMAIN_SIZE" ] || XENSTORE_DOMAIN_ARGS="$XENSTORE_DOMAIN_ARGS --maxmem $XENSTORE_MAX_DOMAIN_SIZE"
|
||
|
|
+ [ -z "$XENSTORE_MAX_DOMAIN_SIZE" ] && XENSTORE_MAX_DOMAIN_SIZE="1/100"
|
||
|
|
+ XENSTORE_DOMAIN_ARGS="$XENSTORE_DOMAIN_ARGS --maxmem $XENSTORE_MAX_DOMAIN_SIZE"
|
||
|
|
|
||
|
|
echo -n Starting $XENSTORE_DOMAIN_KERNEL...
|
||
|
|
${LIBEXEC_BIN}/init-xenstore-domain $XENSTORE_DOMAIN_ARGS || exit 1
|