- build with python3 by default

[packages/xen.git] / xen-systemd.patch

diff --git a/xen-systemd.patch b/xen-systemd.patch
index 3230232a256fd5b598bf11c682574be9f550b29a..6353db121f4d950a02aab3069bd21589ca11f347 100644 (file)
--- a/xen-systemd.patch
+++ b/xen-systemd.patch
@@ -1,6 +1,6 @@
---- xen-4.6.1/tools/hotplug/Linux/systemd/xenconsoled.service.in.orig  2016-04-10 22:41:41.095161609 +0900
-+++ xen-4.6.1/tools/hotplug/Linux/systemd/xenconsoled.service.in       2016-04-10 22:42:13.745756123 +0900
-@@ -7,13 +7,13 @@
+--- xen-4.9.0/tools/hotplug/Linux/systemd/xenconsoled.service.in.orig  2017-07-30 21:05:26.089563010 +0200
++++ xen-4.9.0/tools/hotplug/Linux/systemd/xenconsoled.service.in       2017-07-30 21:12:17.189558321 +0200
+@@ -7,12 +7,12 @@
  [Service]
  Type=simple
  Environment=XENCONSOLED_ARGS=
@@ -9,22 +9,21 @@
  Environment=XENCONSOLED_LOG_DIR=@XEN_LOG_DIR@/console
 -EnvironmentFile=@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons
 +EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenconsoled
- PIDFile=@XEN_RUN_DIR@/xenconsoled.pid
  ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
  ExecStartPre=/bin/mkdir -p ${XENCONSOLED_LOG_DIR}
--ExecStart=@sbindir@/xenconsoled --pid-file @XEN_RUN_DIR@/xenconsoled.pid --log=${XENCONSOLED_TRACE} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS
-+ExecStart=@sbindir@/xenconsoled --pid-file @XEN_RUN_DIR@/xenconsoled.pid --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS
+-ExecStart=@sbindir@/xenconsoled -i --log=${XENCONSOLED_TRACE} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS
++ExecStart=@sbindir@/xenconsoled -i --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS
  
  [Install]
  WantedBy=multi-user.target
---- xen-4.6.1/tools/hotplug/Linux/systemd/xenstored.service.in.orig    2016-04-10 22:43:44.334072370 +0900
-+++ xen-4.6.1/tools/hotplug/Linux/systemd/xenstored.service.in 2016-04-10 22:44:19.164706660 +0900
-@@ -11,7 +11,7 @@
- KillMode=none
- Environment=XENSTORED_ARGS=
- Environment=XENSTORED=@XENSTORED@
--EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons
-+EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored
- ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
- ExecStartPre=-/bin/rm -f @XEN_LIB_STORED@/tdb*
- ExecStartPre=/bin/mkdir -p @XEN_RUN_DIR@
+--- xen-4.9.0/tools/hotplug/Linux/launch-xenstore.in.orig      2017-06-27 20:13:19.000000000 +0200
++++ xen-4.9.0/tools/hotplug/Linux/launch-xenstore.in   2017-07-30 21:16:13.246222287 +0200
+@@ -46,7 +46,7 @@
+ 
+ test_xenstore && exit 0
+ 
+-test -f @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons && . @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons
++test -f @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored && . @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored
+ 
+ [ "$XENSTORETYPE" = "" ] && XENSTORETYPE=daemon
+