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

[Michael Tautschnig]

Author: mt
Date: 2009-12-01 20:47:57 +0000 (Tue, 01 Dec 2009)
New Revision: 5687

Modified:
   trunk/debian/changelog
   trunk/lib/fai-vol_id
Log:
merged bugfix of #56168 for fai-vol_id


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-12-01 20:43:35 UTC (rev 5686)
+++ trunk/debian/changelog	2009-12-01 20:47:57 UTC (rev 5687)
@@ -8,6 +8,8 @@
   * setup-storage.8: Updated documentation, added cryptsetup example.
   * setup-storage/Parser.pm, setup-storage.8: Added new sameas disk_config
     option (thanks Julien BLACHE for the patch).
+  * fai-vol_id: Use blkid by default, use vol_id -L to obtain volume label
+    when using vol_id (thanks Klaus Ethgen). (closes: #556168)
 
  -- Thomas Lange <lange at debian.org>  Tue, 01 Dec 2009 21:41:56 +0100
 

Modified: trunk/lib/fai-vol_id
===================================================================
--- trunk/lib/fai-vol_id	2009-12-01 20:43:35 UTC (rev 5686)
+++ trunk/lib/fai-vol_id	2009-12-01 20:47:57 UTC (rev 5687)
@@ -21,7 +21,7 @@
     exit $?
   fi
 
-  /lib/udev/vol_id -l $1
+  /lib/udev/vol_id -L $1
   exitcode=$?
   if [ $exitcode -eq 0 -o $exitcode -eq 3 ] ; then
     exitcode=0
@@ -32,9 +32,10 @@
 
 # main program
 
-if [ ! -e $udev_vol_id ] ; then
+if [ -e $udev_blkid ] ; then
   udev_vol_id=""
-  if [ ! -e $udev_blkid ] ; then
+else
+  if [ ! -e $udev_vol_id ] ; then
     "Neither udev vol_id nor blkid found!"
     exit 1
   fi