From 899e28ce5817e6fb73da32db01e7777e6c5e85c6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 10 Apr 2016 22:49:27 +0900 Subject: [PATCH] - patch upstream systemd services to match PLD ones --- xen-systemd.patch | 30 ++++++++++++++++++++++++++++++ xen.spec | 10 ++-------- xenconsoled.service | 18 ------------------ xenstored.service | 22 ---------------------- 4 files changed, 32 insertions(+), 48 deletions(-) create mode 100644 xen-systemd.patch delete mode 100644 xenconsoled.service delete mode 100644 xenstored.service diff --git a/xen-systemd.patch b/xen-systemd.patch new file mode 100644 index 0000000..3230232 --- /dev/null +++ b/xen-systemd.patch @@ -0,0 +1,30 @@ +--- 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 @@ + [Service] + Type=simple + Environment=XENCONSOLED_ARGS= +-Environment=XENCONSOLED_TRACE=none ++Environment=XENCONSOLED_LOG=none + 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 + + [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@ diff --git a/xen.spec b/xen.spec index 78b5cb0..bcf3ab3 100644 --- a/xen.spec +++ b/xen.spec @@ -1,7 +1,5 @@ # # TODO: -# - verify upstream systemd .services vs SOURCES -# at least patch to use PLD-specific # - check if other tools/libs are not usable in domU, move them to -guest # packages if so # - pass bconds to qemu configure script (tricky, as the script is called from @@ -66,11 +64,7 @@ Source18: http://xenbits.xen.org/xen-extfiles/tpm_emulator-%{tpm_emulator_versio # Source18-md5: e26becb8a6a2b6695f6b3e8097593db8 Source19: ftp://ftp.gmplib.org/pub/gmp-%{gmp_version}/gmp-%{gmp_version}.tar.bz2 # Source19-md5: dd60683d7057917e34630b4a787932e8 -#Source34: xenconsoled.service -# XXX: upstream xenconsoled expects xencommons Source35: xenconsoled.sysconfig -#Source36: xenstored.service -# XXX: upstream xenstored expects xencommons Source37: xenstored.sysconfig Source38: xenstored.tmpfiles Source43: xendomains.sh @@ -107,6 +101,7 @@ Patch20: %{name}-gnutls-3.4.patch Patch21: %{name}-grep-typo.patch Patch22: %{name}-stubdom-build.patch Patch23: link.patch +Patch24: %{name}-systemd.patch URL: http://www.xen.org/products/xenhyp.html BuildRequires: autoconf >= 2.67 %ifarch %{ix86} %{x8664} @@ -405,6 +400,7 @@ Nadzorca Xen w postaci, która może być uruchomiona wprost z firmware %patch21 -p1 %patch22 -p1 %patch23 -p1 +%patch24 -p1 # stubdom sources ln -s %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom @@ -485,9 +481,7 @@ install -d $RPM_BUILD_ROOT/etc/efi-boot/update.d DESTDIR=$RPM_BUILD_ROOT \ HOTPLUGS=install-udev -#install %{SOURCE34} $RPM_BUILD_ROOT%{systemdunitdir}/xenconsoled.service install %{SOURCE35} $RPM_BUILD_ROOT/etc/sysconfig/xenconsoled -#install %{SOURCE36} $RPM_BUILD_ROOT%{systemdunitdir}/xenstored.service install %{SOURCE37} $RPM_BUILD_ROOT/etc/sysconfig/xenstored install %{SOURCE43} $RPM_BUILD_ROOT%{_libdir}/%{name}/bin/xendomains.sh # sysvinit scripts diff --git a/xenconsoled.service b/xenconsoled.service deleted file mode 100644 index 4c5429f..0000000 --- a/xenconsoled.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=Xenconsoled - handles logging from guest consoles and hypervisor -Requires=proc-xen.mount -After=proc-xen.mount xenstored.service -ConditionPathExists=/proc/xen - -[Service] -Type=simple -Environment=XENCONSOLED_ARGS= -Environment=XENCONSOLED_LOG=none -Environment=XENCONSOLED_LOG_DIR=/var/log/xen/console -EnvironmentFile=-/etc/sysconfig/xenconsoled -PIDFile=/var/run/xenconsoled.pid -ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities -ExecStart=/usr/sbin/xenconsoled --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS - -[Install] -WantedBy=multi-user.target diff --git a/xenstored.service b/xenstored.service deleted file mode 100644 index 65870dc..0000000 --- a/xenstored.service +++ /dev/null @@ -1,22 +0,0 @@ -[Unit] -Description=Xenstored - daemon managing xenstore file system -Requires=proc-xen.mount var-lib-xenstored.mount -After=proc-xen.mount var-lib-xenstored.mount -Before=libvirtd.service libvirt-guests.service xendomains.service xend.service -RefuseManualStop=true -ConditionPathExists=/proc/xen - -[Service] -Type=forking -Environment=XENSTORED_ARGS= -Environment=XENSTORED_ROOTDIR=/var/lib/xenstored -EnvironmentFile=-/etc/sysconfig/xenstored -PIDFile=/var/run/xenstored.pid -ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities -ExecStartPre=-/bin/rm -f "$XENSTORED_ROOTDIR"/tdb* -ExecStart=/usr/sbin/xenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS -ExecStartPost=/usr/bin/xenstore-write "/local/domain/0/name" "Domain-0" -ExecStartPost=/usr/bin/xenstore-write "/local/domain/0/domid" "0" - -[Install] -WantedBy=multi-user.target -- 2.44.0