packages: xen/xen.spec, xen/xenstored.init - fix condition in xenstored.ini...

[baggins]

Author: baggins                      Date: Wed Feb 29 19:55:54 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix condition in xenstored.init
- properly install sysconfig files

---- Files affected:
packages/xen:
   xen.spec (1.96 -> 1.97) , xenstored.init (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/xen/xen.spec
diff -u packages/xen/xen.spec:1.96 packages/xen/xen.spec:1.97
--- packages/xen/xen.spec:1.96	Wed Feb 29 14:44:23 2012
+++ packages/xen/xen.spec	Wed Feb 29 20:55:49 2012
@@ -231,11 +231,11 @@
 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
@@ -420,6 +420,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.97  2012/02/29 19:55:49  baggins
+- fix condition in xenstored.init
+- properly install sysconfig files
+
 Revision 1.96  2012/02/29 13:44:23  baggins
 - added POSIX-sh compatible init scripts
 - added systemd services and configs

================================================================
Index: packages/xen/xenstored.init
diff -u packages/xen/xenstored.init:1.1 packages/xen/xenstored.init:1.2
--- packages/xen/xenstored.init:1.1	Wed Feb 29 14:44:23 2012
+++ packages/xen/xenstored.init	Wed Feb 29 20:55:49 2012
@@ -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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xen/xen.spec?r1=1.96&r2=1.97&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xen/xenstored.init?r1=1.1&r2=1.2&f=u