packages: ploop/ploop.spec, ploop/60-persistant-storage-ploop.rules (NEW)=?UTF-8?Q?=20?=-...

brushek brushek at pld-linux.org
Thu May 24 01:02:56 CEST 2012


Author: brushek                      Date: Wed May 23 23:02:56 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- changed triggerin to external file for udev, is it OK ?
- added 60-persistant-storage-ploop.rules

---- Files affected:
packages/ploop:
   ploop.spec (1.4 -> 1.5) , 60-persistant-storage-ploop.rules (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ploop/ploop.spec
diff -u packages/ploop/ploop.spec:1.4 packages/ploop/ploop.spec:1.5
--- packages/ploop/ploop.spec:1.4	Wed May 23 12:09:56 2012
+++ packages/ploop/ploop.spec	Thu May 24 01:02:50 2012
@@ -8,11 +8,12 @@
 Summary(pl.UTF-8):	Narzędzia do urządzeń i obrazów ploop
 Name:		ploop
 Version:	1.2
-Release:	0.1
+Release:	0.2
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://download.openvz.org/utils/ploop/%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5:	ae1faffff5aaa4b7ceb794676c294844
+Source1:	60-persistant-storage-%{name}.rules
 URL:		http://wiki.openvz.org/Ploop
 BuildRequires:	libxml2-devel
 BuildRequires:	sed >= 4.0
@@ -83,16 +84,13 @@
 	LIBDIR=%{_libdir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# install custom udev rules for ploop
+install -d $RPM_BUILD_ROOT/lib/udev/rules.d/
+cp -a %{SOURCE1} $RPM_BUILD_ROOT/lib/udev/rules.d/60-persistant-storage-%{name}.rules
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerin -- udev
-SCRIPT="/lib/udev/rules.d/60-persistent-storage.rules"
-if [ -f $SCRIPT ]; then
-	fgrep 'KERNEL=="ploop*", GOTO="persistent_storage_end"' $SCRIPT > /dev/null 2>&1 ||
-	sed -i -e '1 s/^/KERNEL=="ploop*", GOTO="persistent_storage_end"\n/;' $SCRIPT
-fi
-
 %files
 %defattr(644,root,root,755)
 %doc tools/README
@@ -105,6 +103,7 @@
 %attr(755,root,root) %{_sbindir}/ploop-grow
 %attr(755,root,root) %{_sbindir}/ploop-merge
 %attr(755,root,root) %{_sbindir}/ploop-stat
+%attr(755,root,root) /lib/udev/rules.d/60-persistant-storage-%{name}.rules
 
 %files libs
 %defattr(644,root,root,755)
@@ -128,6 +127,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2012/05/23 23:02:50  brushek
+- changed triggerin to external file for udev, is it OK ?
+- added 60-persistant-storage-ploop.rules
+
 Revision 1.4  2012/05/23 10:09:56  qboosh
 - pl
 - added -static

================================================================
Index: packages/ploop/60-persistant-storage-ploop.rules
diff -u /dev/null packages/ploop/60-persistant-storage-ploop.rules:1.1
--- /dev/null	Thu May 24 01:02:56 2012
+++ packages/ploop/60-persistant-storage-ploop.rules	Thu May 24 01:02:50 2012
@@ -0,0 +1 @@
+KERNEL=="ploop*", GOTO="persistent_storage_end"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/ploop/ploop.spec?r1=1.4&r2=1.5



More information about the pld-cvs-commit mailing list