packages: module-init-tools/module-init-tools.spec - reviewed trigger

[glen]

Author: glen                         Date: Tue Aug 11 07:26:28 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- reviewed trigger

---- Files affected:
packages/module-init-tools:
   module-init-tools.spec (1.79 -> 1.80) 

---- Diffs:

================================================================
Index: packages/module-init-tools/module-init-tools.spec
diff -u packages/module-init-tools/module-init-tools.spec:1.79 packages/module-init-tools/module-init-tools.spec:1.80
--- packages/module-init-tools/module-init-tools.spec:1.79	Tue Aug 11 09:16:10 2009
+++ packages/module-init-tools/module-init-tools.spec	Tue Aug 11 09:26:23 2009
@@ -123,19 +123,16 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ ! -s /etc/modprobe.conf -a -x /sbin/modprobe.modutils -a -f /etc/modules.conf ] && [ -d /lib/modules/`uname -r` ]; then
+if [ ! -s /etc/modprobe.d/modprobe.conf -a -x /sbin/modprobe.modutils -a -f /etc/modules.conf ] && [ -d /lib/modules/$(uname -r) ]; then
 	echo "Generating /etc/modprobe.d/modprobe.conf from obsolete /etc/modules.conf"
 	%{_sbindir}/generate-modprobe.conf /etc/modprobe.d/modprobe.conf
+	mv -f /etc/modules.conf{,.rpmsave}
 fi
 
 %triggerpostun -- %{name} < 3.10
-if [ -f /etc/modprobe.conf ]; then
-	mv -f /etc/modprobe.conf /etc/modprobe.conf.rpmsave
-	if [ -f /etc/modprobe.d/modprobe.conf ]; then
-		mv -f /etc/modprobe.conf /etc/modprobe.d/modprobe.conf.rpmnew
-	else
-		mv -f /etc/modprobe.conf /etc/modprobe.d/modprobe.conf
-	fi
+if [ -f /etc/modprobe.conf.rpmsave ]; then
+	cp -f /etc/modprobe.d/modprobe.conf{,.rpmnew}
+	mv -f /etc/modprobe.conf.rpmsave /etc/modprobe.d/modprobe.conf
 fi
 
 %files
@@ -166,6 +163,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.80  2009/08/11 07:26:23  glen
+- reviewed trigger
+
 Revision 1.79  2009/08/11 07:16:10  arekm
 - s/triggerun/triggerpostun
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/module-init-tools/module-init-tools.spec?r1=1.79&r2=1.80&f=u