- fix condition in xenstored.init

- properly install sysconfig files

Changed files:
    xen.spec -> 1.97
    xenstored.init -> 1.2

diff --git a/xen.spec b/xen.spec
index 8f926afe531ffcb04ffa7c566a2b2f7441f9df6c..208b057c257fbe32094b422197cbd0ddd9e2863a 100644 (file)
--- a/xen.spec
+++ b/xen.spec
@@ -230,11 +230,11 @@ install -d $RPM_BUILD_ROOT/etc/xen/examples \
 install %{SOURCE30} $RPM_BUILD_ROOT%{systemdunitdir}/proc-xen.mount
 install %{SOURCE31} $RPM_BUILD_ROOT%{systemdunitdir}/var-lib-xenstored.mount
 install %{SOURCE32} $RPM_BUILD_ROOT%{systemdunitdir}/blktapctrl.service
-install %{SOURCE33} $RPM_BUILD_ROOT/etc/sysconfig/blktapctrl.sysconfig
+install %{SOURCE33} $RPM_BUILD_ROOT/etc/sysconfig/blktapctrl
 install %{SOURCE34} $RPM_BUILD_ROOT%{systemdunitdir}/xenconsoled.service
-install %{SOURCE35} $RPM_BUILD_ROOT/etc/sysconfig/xenconsoled.sysconfig
+install %{SOURCE35} $RPM_BUILD_ROOT/etc/sysconfig/xenconsoled
 install %{SOURCE36} $RPM_BUILD_ROOT%{systemdunitdir}/xenstored.service
-install %{SOURCE37} $RPM_BUILD_ROOT/etc/sysconfig/xenstored.sysconfig
+install %{SOURCE37} $RPM_BUILD_ROOT/etc/sysconfig/xenstored
 install %{SOURCE38} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/xenstored.conf
 install %{SOURCE39} $RPM_BUILD_ROOT%{systemdunitdir}/xend.service
 install %{SOURCE40} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/xend.conf

diff --git a/xenstored.init b/xenstored.init
index b65b9394ef8813350aab5e1abc43c3d028384f80..0c0a8bda9e2b181f8cae73a3e16eb1bbe148ab42 100644 (file)
--- a/xenstored.init
+++ b/xenstored.init
@@ -21,7 +21,7 @@
 . /etc/rc.d/init.d/functions
 
 # Read in configuration options.
-[ /etc/sysconfig/xenstored ] && . /etc/sysconfig/xenstored
+[ -f /etc/sysconfig/xenstored ] && . /etc/sysconfig/xenstored
 
 if [ "$1" = "start" -a -d /proc/xen -a ! -f /proc/xen/capabilities ] && \
                ! grep -qs '^xenfs ' /proc/mounts >/dev/null; then