[Fai-commit] r5869 - in trunk: debian lib

[Thomas Lange]

Author: lange
Date: 2010-07-26 20:10:19 +0000 (Mon, 26 Jul 2010)
New Revision: 5869

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

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-07-26 19:49:26 UTC (rev 5868)
+++ trunk/debian/changelog	2010-07-26 20:10:19 UTC (rev 5869)
@@ -49,6 +49,8 @@
   * 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: trunk/lib/task_sysinfo
===================================================================
--- trunk/lib/task_sysinfo	2010-07-26 19:49:26 UTC (rev 5868)
+++ trunk/lib/task_sysinfo	2010-07-26 20:10:19 UTC (rev 5869)
@@ -30,8 +30,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
@@ -40,7 +38,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