[pve-devel] r5084 - pve-installer/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-08-30 12:43:19 +0000 (Mon, 30 Aug 2010)
New Revision: 5084

Modified:
   pve-installer/trunk/Makefile
   pve-installer/trunk/changelog
   pve-installer/trunk/proxinstall
Log:


Modified: pve-installer/trunk/Makefile
===================================================================
--- pve-installer/trunk/Makefile	2010-08-30 10:13:43 UTC (rev 5083)
+++ pve-installer/trunk/Makefile	2010-08-30 12:43:19 UTC (rev 5084)
@@ -1,7 +1,7 @@
 # achtung: also set release in proxinstall!
 RELEASE=1.6
 
-DEB=pve-installer_1.0-9.deb
+DEB=pve-installer_1.0-10.deb
 
 INSTALLER_SOURCES=		\
 	unconfigured.sh 	\

Modified: pve-installer/trunk/changelog
===================================================================
--- pve-installer/trunk/changelog	2010-08-30 10:13:43 UTC (rev 5083)
+++ pve-installer/trunk/changelog	2010-08-30 12:43:19 UTC (rev 5084)
@@ -1,3 +1,10 @@
+pve-installer (1.0-10) unstable; urgency=low
+
+  * udev does not set DEVTYPE correctly, so we need to read that from
+    uevent (observed on new 2.6.32 kernels)
+
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 30 Aug 2010 14:42:06 +0200
+
 pve-installer (1.0-9) unstable; urgency=low
 
   * fix netmask bug

Modified: pve-installer/trunk/proxinstall
===================================================================
--- pve-installer/trunk/proxinstall	2010-08-30 10:13:43 UTC (rev 5083)
+++ pve-installer/trunk/proxinstall	2010-08-30 12:43:19 UTC (rev 5084)
@@ -275,11 +275,14 @@
 	
 	next if !$dev;
 
-	my $info = `udevadm info --path $bd --query all`;
+	# udev does not set DEVTYPE correctly, so we need to read that 
+	# from uevent
+	my $info = `cat $bd/uevent`;
+	next if !$info || $info !~ m/^DEVTYPE=disk$/m;
+
+	$info = `udevadm info --path $bd --query all`;
 	next if !$info;
 
-	next if $info !~ m/^E: DEVTYPE=disk$/m;
-
 	next if $info =~ m/^E: ID_CDROM/m;
 
 	my ($name) = $info =~ m/^N: (\S+)$/m;