packages: kernel/kernel.spec - update initrd and boot loaders in posttrans ...

[glen]

Author: glen                         Date: Wed Mar 10 17:24:09 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update initrd and boot loaders in posttrans so modules like nouveau are
  available from dependant packages, also fixes grub loader seeing about to be
  removed kernel images
- load grub config in subshell to avoid variable clobbering
- grub2 >= 1.97.2-2 has diagnostic messages in stdout, so make stderr messages visible
- conflict with older rpm without working posttrans support

---- Files affected:
packages/kernel:
   kernel.spec (1.770 -> 1.771) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.770 packages/kernel/kernel.spec:1.771
--- packages/kernel/kernel.spec:1.770	Tue Mar  9 10:51:52 2010
+++ packages/kernel/kernel.spec	Wed Mar 10 18:24:03 2010
@@ -116,7 +116,7 @@
 
 %define		basever		2.6.33
 %define		postver		%{nil}
-%define		rel		0.1
+%define		rel			0.2
 
 %define		_enable_debug_packages			0
 
@@ -379,10 +379,9 @@
 Conflicts:	ppp < 1:2.4.0
 Conflicts:	procps < 3.2.0
 Conflicts:	quota-tools < 3.09
-%if %{with reiserfs4}
-Conflicts:	reiser4progs < 1.0.0
-%endif
+%{?with_reiserfs4:Conflicts:	reiser4progs < 1.0.0}
 Conflicts:	reiserfsprogs < 3.6.3
+Conflicts:	rpm < 4.4.2-0.2
 Conflicts:	udev < 1:081
 Conflicts:	util-linux < 2.10o
 Conflicts:	util-vserver < 0.30.216
@@ -1242,19 +1241,20 @@
 
 %depmod %{kernel_release}
 
+%posttrans
+# generate initrd after all dependant modules are installed
 /sbin/geninitrd -f --initrdfs=rom %{initrd_dir}/initrd-%{kernel_release}.gz %{kernel_release}
 mv -f %{initrd_dir}/initrd{,.old} 2> /dev/null
 %{?alt_kernel:mv -f %{initrd_dir}/initrd%{_alt_kernel}{,.old} 2> /dev/null}
 ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd
 %{?alt_kernel:ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd%{_alt_kernel}}
 
+# update boot loaders when old package files are gone from filesystem
 if [ -x /sbin/update-grub -a -f /etc/sysconfig/grub ]; then
-	. /etc/sysconfig/grub
-	if [ "$UPDATE_GRUB" = "yes" ]; then
-		/sbin/update-grub >/dev/null 2>&1
+	if [ "$(. /etc/sysconfig/grub; echo ${UPDATE_GRUB:-no})" = "yes" ]; then
+		/sbin/update-grub >/dev/null
 	fi
 fi
-
 if [ -x /sbin/new-kernel-pkg ]; then
 	/sbin/new-kernel-pkg --initrdfile=%{initrd_dir}/initrd-%{kernel_release}.gz --install %{kernel_release} --banner "PLD Linux (%{pld_release})%{?alt_kernel: / %{alt_kernel}}"
 fi
@@ -1593,6 +1593,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.771  2010/03/10 17:24:03  glen
+- update initrd and boot loaders in posttrans so modules like nouveau are
+  available from dependant packages, also fixes grub loader seeing about to be
+  removed kernel images
+- load grub config in subshell to avoid variable clobbering
+- grub2 >= 1.97.2-2 has diagnostic messages in stdout, so make stderr messages visible
+- conflict with older rpm without working posttrans support
+
 Revision 1.770  2010/03/09 09:51:52  glen
 - restore grub2 hook, disabled in config by default
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.770&r2=1.771&f=u