[pve-devel] r6160 - pve-kernel-2.6.32-rh/pve2

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-06-24 12:49:38 +0200 (Fri, 24 Jun 2011)
New Revision: 6160

Modified:
   pve-kernel-2.6.32-rh/pve2/Makefile
   pve-kernel-2.6.32-rh/pve2/changelog.Debian
   pve-kernel-2.6.32-rh/pve2/postinst.in
Log:


Modified: pve-kernel-2.6.32-rh/pve2/Makefile
===================================================================
--- pve-kernel-2.6.32-rh/pve2/Makefile	2011-06-24 10:42:58 UTC (rev 6159)
+++ pve-kernel-2.6.32-rh/pve2/Makefile	2011-06-24 10:49:38 UTC (rev 6160)
@@ -1,7 +1,7 @@
-RELEASE=1.8
+RELEASE=2.0
 
 KERNEL_VER=2.6.32
-PKGREL=36
+PKGREL=37
 # alsp include priv firmware into the fw package  fwlist-2.6.32-PREV-pve
 KREL=6
 
@@ -66,7 +66,7 @@
 	dpkg-deb --build proxmox-ve/data ${PVE_DEB}
 
 check_gcc: 
-	gcc --version|grep "4.3.2" || false
+	gcc --version|grep "4.5.5" || false
 
 ${DST_DEB}: data control.in postinst.in
 	mkdir -p data/DEBIAN

Modified: pve-kernel-2.6.32-rh/pve2/changelog.Debian
===================================================================
--- pve-kernel-2.6.32-rh/pve2/changelog.Debian	2011-06-24 10:42:58 UTC (rev 6159)
+++ pve-kernel-2.6.32-rh/pve2/changelog.Debian	2011-06-24 10:49:38 UTC (rev 6160)
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-37) unstable; urgency=low
+
+  * copied from trunk, make it work on squeeze
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 24 Jun 2011 12:49:10 +0200
+
 pve-kernel-2.6.32 (2.6.32-36) unstable; urgency=low
 
   * use kernel from OpenVZ project as base

Modified: pve-kernel-2.6.32-rh/pve2/postinst.in
===================================================================
--- pve-kernel-2.6.32-rh/pve2/postinst.in	2011-06-24 10:42:58 UTC (rev 6159)
+++ pve-kernel-2.6.32-rh/pve2/postinst.in	2011-06-24 10:49:38 UTC (rev 6160)
@@ -16,10 +16,8 @@
 
 system("update-initramfs -c -t -b $imagedir -k $version"); 
 
-if (-x "/usr/sbin/grub") {
-    system("update-grub -y");
-} elsif (-e "/etc/lilo.conf") {
-    system("lilo");
+if (-x "/usr/sbin/update-grub") {
+    system("/usr/sbin/update-grub");
 }
 
 exit 0