[Fai-commit] r6001 - in branches/stable/3.4: debian lib

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:55:34 +0000 (Tue, 17 Aug 2010)
New Revision: 6001

Modified:
   branches/stable/3.4/debian/changelog
   branches/stable/3.4/lib/task_sysinfo
Log:
task_sysinfo: remove call of sysinfo (non open source software), check if blkid exists before calling it


Conflicts:

	debian/changelog

Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:55:29 UTC (rev 6000)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:55:34 UTC (rev 6001)
@@ -47,6 +47,10 @@
     Parser.pm,Sizes.pm,Volumes.pm: add $Id$
   * savelog.LAST: ignore ACPI Warning
   * control: fix duplicate Depends on iproute
+  * fai-savelog: add messages, if some variables are not defined,
+    minor code cleanup
+  * task_sysinfo: remove call of sysinfo (non open source software), check
+    if blkid exists before calling it
 
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks

Modified: branches/stable/3.4/lib/task_sysinfo
===================================================================
--- branches/stable/3.4/lib/task_sysinfo	2010-08-17 12:55:29 UTC (rev 6000)
+++ branches/stable/3.4/lib/task_sysinfo	2010-08-17 12:55:34 UTC (rev 6001)
@@ -28,8 +28,6 @@
 echo "Ethernet cards running: $netdevices_up"
 ip addr show up
 
-[ -x "$(which sysinfo)" ] && sysinfo -class device -level all
-
 [ -x "$(which sfdisk)" ] && sfdisk -d
 
 # show ide disk geometry
@@ -38,7 +36,7 @@
 [ -f /proc/scsi/scsi ] && cat /proc/scsi/scsi
 cat /proc/partitions
 
-blkid
+[ -x "$(which blkid)" ] && blkid
 
 for disk in $disklist; do
     smartctl -i /dev/$disk