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

[Thomas Lange]

Author: lange
Date: 2010-07-28 21:26:58 +0000 (Wed, 28 Jul 2010)
New Revision: 5895

Modified:
   trunk/debian/changelog
   trunk/lib/fai-vol_id
Log:
fai-vol_id: cleanup code

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-07-28 20:58:49 UTC (rev 5894)
+++ trunk/debian/changelog	2010-07-28 21:26:58 UTC (rev 5895)
@@ -95,6 +95,7 @@
     they are present
   * fai-cd: add checks if package download succeeded
   * fai-cd: fix, use grub.cfg for grub2
+  * fai-vol_id: cleanup code
   
  -- Thomas Lange <lange at debian.org>  Wed, 28 Jul 2010 16:28:51 -0400
 

Modified: trunk/lib/fai-vol_id
===================================================================
--- trunk/lib/fai-vol_id	2010-07-28 20:58:49 UTC (rev 5894)
+++ trunk/lib/fai-vol_id	2010-07-28 21:26:58 UTC (rev 5895)
@@ -2,28 +2,32 @@
 
 # Copyright (c) 2009 by Michael Tautschnig <mt at debian.org>
 
-udev_vol_id="/lib/udev/vol_id"
-udev_blkid="/sbin/blkid"
+vol_id="/lib/udev/vol_id"
+blkid="/sbin/blkid"
 
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 get_uuid() {
-  if [ -z $udev_vol_id ] ; then
-    $udev_blkid -s UUID -o value $1
+
+  if [ -z $vol_id ] ; then
+    $blkid -s UUID -o value $1
     exit $?
   fi
 
-  /lib/udev/vol_id -u $1
+  $vol_id -u $1
   exit $?
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 get_label() {
-  if [ -z $udev_vol_id ] ; then
-    $udev_blkid -s LABEL -o value $1
+
+  if [ -z $vol_id ] ; then
+    $blkid -s LABEL -o value $1
     exit $?
   fi
 
-  /lib/udev/vol_id -L $1
+  $vol_id -L $1
   exitcode=$?
-  if [ $exitcode -eq 0 -o $exitcode -eq 3 ] ; then
+  if [ $exitcode -eq 3 ] ; then
     exitcode=0
   fi
   exit $exitcode
@@ -32,10 +36,10 @@
 
 # main program
 
-if [ -e $udev_blkid ] ; then
-  udev_vol_id=""
+if [ -e $blkid ] ; then
+  vol_id=""
 else
-  if [ ! -e $udev_vol_id ] ; then
+  if [ ! -e $vol_id ] ; then
     "Neither udev vol_id nor blkid found!"
     exit 1
   fi