- bnc#927750 - Avoid errors reported by system-modules-load.service
OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=359
This commit is contained in:
parent
b6d9f3c173
commit
35e73086a7
16
xen-dom0-modules.service
Normal file
16
xen-dom0-modules.service
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Load dom0 backend drivers
|
||||||
|
ConditionPathExists=/proc/xen
|
||||||
|
Before=proc-xen.mount
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
RemainAfterExit=true
|
||||||
|
Environment=PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
|
||||||
|
# dummy to have always one valid line
|
||||||
|
ExecStart=-/usr/bin/env uname -a
|
||||||
|
# modules listed in /usr/lib/modules.d/xen.conf
|
||||||
|
# load them manually to avoid usage of system-modules-load.service
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Apr 21 12:21:05 UTC 2015 - ohering@suse.de
|
||||||
|
|
||||||
|
- bnc#927750 - Avoid errors reported by system-modules-load.service
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 8 10:17:41 UTC 2015 - rguenther@suse.com
|
Wed Apr 8 10:17:41 UTC 2015 - rguenther@suse.com
|
||||||
|
|
||||||
|
14
xen.spec
14
xen.spec
@ -194,6 +194,7 @@ Source36: xnloader.py
|
|||||||
Source37: xen2libvirt.py
|
Source37: xen2libvirt.py
|
||||||
# Systemd service files
|
# Systemd service files
|
||||||
Source41: xencommons.service
|
Source41: xencommons.service
|
||||||
|
Source42: xen-dom0-modules.service
|
||||||
Source57: xen-utils-0.1.tar.bz2
|
Source57: xen-utils-0.1.tar.bz2
|
||||||
# For xen-libs
|
# For xen-libs
|
||||||
Source99: baselibs.conf
|
Source99: baselibs.conf
|
||||||
@ -868,6 +869,19 @@ enable xendomains.service
|
|||||||
EOF
|
EOF
|
||||||
%endif
|
%endif
|
||||||
cp -bavL %{S:41} $RPM_BUILD_ROOT%{_unitdir}
|
cp -bavL %{S:41} $RPM_BUILD_ROOT%{_unitdir}
|
||||||
|
bn=`basename %{S:42}`
|
||||||
|
cp -bavL %{S:42} $RPM_BUILD_ROOT%{_unitdir}/${bn}
|
||||||
|
mods="`
|
||||||
|
for conf in $(ls $RPM_BUILD_ROOT%{with_systemd_modules_load}/*.conf)
|
||||||
|
do
|
||||||
|
grep -v ^# $conf
|
||||||
|
echo -n > $conf
|
||||||
|
done
|
||||||
|
`"
|
||||||
|
for mod in $mods
|
||||||
|
do
|
||||||
|
echo "ExecStart=-/usr/bin/env modprobe $mod" >> $RPM_BUILD_ROOT%{_unitdir}/${bn}
|
||||||
|
done
|
||||||
rm -rfv $RPM_BUILD_ROOT%{_initddir}
|
rm -rfv $RPM_BUILD_ROOT%{_initddir}
|
||||||
%else
|
%else
|
||||||
# Init scripts
|
# Init scripts
|
||||||
|
@ -2,6 +2,10 @@
|
|||||||
Description=xencommons
|
Description=xencommons
|
||||||
ConditionPathExists=/proc/xen/capabilities
|
ConditionPathExists=/proc/xen/capabilities
|
||||||
|
|
||||||
|
# Avoid errors from systemd-modules-load.service
|
||||||
|
Requires=xen-dom0-modules.service
|
||||||
|
After=xen-dom0-modules.service
|
||||||
|
|
||||||
# Pull in all upstream service files
|
# Pull in all upstream service files
|
||||||
Requires=proc-xen.mount
|
Requires=proc-xen.mount
|
||||||
After=proc-xen.mount
|
After=proc-xen.mount
|
||||||
|
Loading…
Reference in New Issue
Block a user