X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel-vanilla.spec;h=e45082af152ec8adf7e35d3bc67568f274bc0534;hb=90a965d64d94858731349a89ce7466ed10d70659;hp=50e67a368df507cacb95b80a9702c9a3f7d94a3a;hpb=0ea897db5a78e839bc562a8e85c549b4791b7d0c;p=packages%2Fkernel.git

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index 50e67a3..e45082a 100644
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -4,8 +4,8 @@
 %bcond_with	verbose		# verbose build (V=1)
 
 %define		basever		3.10
-%define		postver		12
-%define		rel		1
+%define		postver		18
+%define		rel		2
 
 %define		alt_kernel	3.10-vanilla
 
@@ -30,7 +30,7 @@ Source0:	http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5:	4f25cd5bec5f8d5a7d935b3f2ccb8481
 %if "%{postver}" != "0"
 Source1:	http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Source1-md5:	eddd405c4fd16cabdad4fcf7a369d665
+# Source1-md5:	f92a506c0c93813b4b79f79fa6a61e74
 %endif
 
 Source2:	kernel.sysconfig
@@ -526,8 +526,8 @@ fi
 
 %posttrans
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+# generate simple initramfs/initrd image
 if [[ "$USE_GENINITRD" != [Nn][Oo] ]]; then
-	# generate initrd after all dependant modules are installed
 	/sbin/geninitrd -f --initrdfs=initramfs %{initrd_dir}/initrd-%{kernel_release}.img %{kernel_release}
 fi
 
@@ -537,9 +537,10 @@ if [[ "$USE_DRACUT" != [Nn][Oo] ]] && [ -x /sbin/dracut ]; then
 fi
 
 # update boot loaders
-[ -x /sbin/update-grub -a -f /etc/sysconfig/grub ] && . /etc/sysconfig/grub
-if [[ "$UPDATE_GRUB" != [Nn][Oo] ]]; then
-	/sbin/update-grub
+if [ -x /sbin/update-grub -a -f /etc/sysconfig/grub ]; then
+	if [ "$(. /etc/sysconfig/grub; echo ${UPDATE_GRUB:-yes})" = "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}.img --install %{kernel_release} --banner "TLD Linux%{?alt_kernel: %{alt_kernel}}"