From: Jan Rękorajski Date: Sun, 10 Apr 2016 13:30:36 +0000 (+0900) Subject: - removed obsolete systemd service files X-Git-Tag: auto/th/xen-4.6.1-1~1^2~3 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=40222f4e94ab2b55806b9fa7c10ade92013e7e83;hp=dc6e778e4d351aa2cd4d9b32b4dc5fcfd93aaadf;p=packages%2Fxen.git - removed obsolete systemd service files --- diff --git a/proc-xen.mount b/proc-xen.mount deleted file mode 100644 index 0eaa59c..0000000 --- a/proc-xen.mount +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Mount /proc/xen files -ConditionPathExists=/proc/xen -RefuseManualStop=true - -[Mount] -What=xenfs -Where=/proc/xen -Type=xenfs diff --git a/var-lib-xenstored.mount b/var-lib-xenstored.mount deleted file mode 100644 index 9f59ebe..0000000 --- a/var-lib-xenstored.mount +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=mount xenstore file system -ConditionPathExists=/proc/xen -RefuseManualStop=true - -[Mount] -What=xenstore -Where=/var/lib/xenstored -Type=tmpfs diff --git a/xen-dom0-modules-load.conf b/xen-dom0-modules-load.conf deleted file mode 100644 index 247f247..0000000 --- a/xen-dom0-modules-load.conf +++ /dev/null @@ -1,8 +0,0 @@ -# Required for xenstored -xen-evtchn -# Required for PCI passthrough -xen-gntdev -# For vif.X devices in dom0 -xen-netback -# For any type of block device -xen-blkback diff --git a/xen-qemu-dom0-disk-backend.service b/xen-qemu-dom0-disk-backend.service deleted file mode 100644 index 2373ffd..0000000 --- a/xen-qemu-dom0-disk-backend.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -Description=qemu for xen dom0 disk backend -Requires=proc-xen.mount xenstored.service -After=proc-xen.mount xenstored.service xenconsoled.service -Before=xendomains.service libvirtd.service libvirt-guests.service -RefuseManualStop=true -ConditionPathExists=/proc/xen/capabilities -ConditionFileIsExecutable=/usr/bin/qemu-system-i386 - -[Service] -Type=simple -PIDFile=/var/run/qemu-dom0.pid -ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities -ExecStart=/usr/bin/qemu-system-i386 -xen-domid 0 \ - -xen-attach -name dom0 -nographic -M xenpv -daemonize \ - -monitor /dev/null -serial /dev/null -parallel /dev/null \ - -pidfile /var/run/qemu-dom0.pid - -[Install] -WantedBy=multi-user.target diff --git a/xen-watchdog.service b/xen-watchdog.service deleted file mode 100644 index 8fd225a..0000000 --- a/xen-watchdog.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Xen-watchdog - run xen watchdog daemon -Requires=proc-xen.mount -After=proc-xen.mount xend.service -ConditionPathExists=/proc/xen - -[Service] -Type=forking -ExecStart=/usr/sbin/xenwatchdogd 30 15 -KillSignal=USR1 - -[Install] -WantedBy=multi-user.target diff --git a/xen.spec b/xen.spec index 62981ea..78b5cb0 100644 --- a/xen.spec +++ b/xen.spec @@ -66,8 +66,6 @@ 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 -#Source30: proc-xen.mount -#Source31: var-lib-xenstored.mount #Source34: xenconsoled.service # XXX: upstream xenconsoled expects xencommons Source35: xenconsoled.sysconfig @@ -75,13 +73,9 @@ Source35: xenconsoled.sysconfig # XXX: upstream xenstored expects xencommons Source37: xenstored.sysconfig Source38: xenstored.tmpfiles -#Source41: xen-watchdog.service -#Source42: xen-dom0-modules-load.conf Source43: xendomains.sh -#Source44: xendomains.service -#Source45: xen-qemu-dom0-disk-backend.service -Source46: xen-qemu-dom0-disk-backend.init # sysvinit scripts +Source46: xen-qemu-dom0-disk-backend.init Source51: xenconsoled.init Source52: xenstored.init Source53: xen-watchdog.init @@ -491,17 +485,11 @@ install -d $RPM_BUILD_ROOT/etc/efi-boot/update.d DESTDIR=$RPM_BUILD_ROOT \ HOTPLUGS=install-udev -#install %{SOURCE30} $RPM_BUILD_ROOT%{systemdunitdir}/proc-xen.mount -#install %{SOURCE31} $RPM_BUILD_ROOT%{systemdunitdir}/var-lib-xenstored.mount #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 %{SOURCE41} $RPM_BUILD_ROOT%{systemdunitdir}/xen-watchdog.service -#install %{SOURCE42} $RPM_BUILD_ROOT/etc/modules-load.d/xen-dom0.conf install %{SOURCE43} $RPM_BUILD_ROOT%{_libdir}/%{name}/bin/xendomains.sh -#install %{SOURCE44} $RPM_BUILD_ROOT%{systemdunitdir}/xendomains.service -#install %{SOURCE45} $RPM_BUILD_ROOT%{systemdunitdir}/xen-qemu-dom0-disk-backend.service # sysvinit scripts %{__rm} $RPM_BUILD_ROOT/etc/rc.d/init.d/* %{__rm} $RPM_BUILD_ROOT/etc/sysconfig/xencommons diff --git a/xendomains.service b/xendomains.service deleted file mode 100644 index f0f4d9f..0000000 --- a/xendomains.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Xendomains - start and stop guests on boot and shutdown -Requires=proc-xen.mount xenstored.service -After=proc-xen.mount xenstored.service xenconsoled.service -ConditionPathExists=/proc/xen - -[Service] -Type=oneshot -RemainAfterExit=true -ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities -ExecStart=-/usr/lib/xen/bin/xendomains.sh start -ExecStop=/usr/lib/xen/bin/xendomains.sh stop -ExecReload=/usr/lib/xen/bin/xendomains.sh restart - -[Install] -WantedBy=multi-user.target