[pve-devel] r5349 - in pve-kernel-2.6.32/pve2: . iscsideb/patches

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-12-20 10:36:13 +0100 (Mon, 20 Dec 2010)
New Revision: 5349

Modified:
   pve-kernel-2.6.32/pve2/Makefile
   pve-kernel-2.6.32/pve2/changelog.Debian
   pve-kernel-2.6.32/pve2/control.in
   pve-kernel-2.6.32/pve2/iscsideb/patches/init-script.diff
   pve-kernel-2.6.32/pve2/postinst.in
Log:
updates for squeeze



Modified: pve-kernel-2.6.32/pve2/Makefile
===================================================================
--- pve-kernel-2.6.32/pve2/Makefile	2010-12-20 07:30:05 UTC (rev 5348)
+++ pve-kernel-2.6.32/pve2/Makefile	2010-12-20 09:36:13 UTC (rev 5349)
@@ -63,7 +63,7 @@
 	dpkg-deb --build proxmox-ve/data ${PVE_DEB}
 
 check_gcc: 
-	gcc --version|grep "4.3.2" || false
+	gcc --version|grep "4.4.5" || false
 
 ${DST_DEB}: data control.in postinst.in
 	mkdir -p data/DEBIAN
@@ -211,7 +211,7 @@
 	cd ${ISCSIDIR}; export KVER=${KVNAME}; dpkg-buildpackage -b -rfakeroot -us -uc
 	cd ${ISCSIDIR}; make KVER=${KVNAME} mods
 	cp ${ISCSIDIR}/kernel/iscsi-scst.ko iscsi-scst.ko 
-	lintian ${ISCSI_DEB}
+	-lintian ${ISCSI_DEB}
 
 headers_tmp := $(CURDIR)/tmp-headers
 headers_dir := $(headers_tmp)/usr/src/linux-headers-${KVNAME}

Modified: pve-kernel-2.6.32/pve2/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/pve2/changelog.Debian	2010-12-20 07:30:05 UTC (rev 5348)
+++ pve-kernel-2.6.32/pve2/changelog.Debian	2010-12-20 09:36:13 UTC (rev 5349)
@@ -2,6 +2,10 @@
 
   * update to debian squeeze kernel 2.6.32-29
 
+  * compile for squeeze
+
+  * add grup-pc dependency (grub2)
+
  -- Proxmox Support Team <support at proxmox.com>  Wed, 15 Dec 2010 13:43:52 +0100
 
 pve-kernel-2.6.32 (2.6.32-29) unstable; urgency=low

Modified: pve-kernel-2.6.32/pve2/control.in
===================================================================
--- pve-kernel-2.6.32/pve2/control.in	2010-12-20 07:30:05 UTC (rev 5348)
+++ pve-kernel-2.6.32/pve2/control.in	2010-12-20 09:36:13 UTC (rev 5349)
@@ -5,7 +5,7 @@
 Architecture: amd64
 Provides: linux-image, linux-image-2.6
 Suggests: pve-firmware
-Depends: grub, initramfs-tools, busybox
+Depends: grub-pc, initramfs-tools, busybox
 Maintainer: Proxmox Support Team <support at proxmox.com>
 Description: The Proxmox PVE Kernel Image
  This package contains the linux kernel and initial ramdisk used for booting

Modified: pve-kernel-2.6.32/pve2/iscsideb/patches/init-script.diff
===================================================================
--- pve-kernel-2.6.32/pve2/iscsideb/patches/init-script.diff	2010-12-20 07:30:05 UTC (rev 5348)
+++ pve-kernel-2.6.32/pve2/iscsideb/patches/init-script.diff	2010-12-20 09:36:13 UTC (rev 5349)
@@ -11,8 +11,8 @@
 +
 +### BEGIN INIT INFO
 +# Provides:          iscsi-scst
-+# Required-Start:    $network $local_fs
-+# Required-Stop:
++# Required-Start:    $network $local_fs $remote_fs
++# Required-Stop:     $remote_fs
 +# Should-Start:      $named
 +# Should-Stop:
 +# Default-Start:     2 3 4 5

Modified: pve-kernel-2.6.32/pve2/postinst.in
===================================================================
--- pve-kernel-2.6.32/pve2/postinst.in	2010-12-20 07:30:05 UTC (rev 5348)
+++ pve-kernel-2.6.32/pve2/postinst.in	2010-12-20 09:36:13 UTC (rev 5349)
@@ -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