[Fai-commit] r6649 - branches/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2011-09-06 16:36:23 +0000 (Tue, 06 Sep 2011)
New Revision: 6649

Modified:
   branches/experimental/patches/setup-storage_udevsettle-before-vol-id
Log:
fai-vol_id: Don't use the cache when calling blkid


Modified: branches/experimental/patches/setup-storage_udevsettle-before-vol-id
===================================================================
--- branches/experimental/patches/setup-storage_udevsettle-before-vol-id	2011-09-06 16:30:12 UTC (rev 6648)
+++ branches/experimental/patches/setup-storage_udevsettle-before-vol-id	2011-09-06 16:36:23 UTC (rev 6649)
@@ -2,6 +2,8 @@
 
 	* setup-storage/Fstab.pm: call udevsettle before reading volume id to avoid
 		race condition.
+	* fai-vol_id: disable use of cache when calling blkid to fix problems when
+		file systems are changed.
 Index: trunk/lib/setup-storage/Fstab.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Fstab.pm
@@ -22,3 +24,25 @@
    &FAI::execute_ro_command(
      "fai-vol_id -l $device_name", \@label, 0);
  
+Index: trunk/lib/fai-vol_id
+===================================================================
+--- trunk.orig/lib/fai-vol_id
++++ trunk/lib/fai-vol_id
+@@ -10,7 +10,7 @@
+ get_uuid() {
+ 
+   if [ -z $vol_id ] ; then
+-    $blkid -s UUID -o value $1
++    $blkid -c /dev/null -s UUID -o value $1
+     exit $?
+   fi
+ 
+@@ -21,7 +21,7 @@
+ get_label() {
+ 
+   if [ -z $vol_id ] ; then
+-    $blkid -s LABEL -o value $1
++    $blkid -c /dev/null -s LABEL -o value $1
+     exit $?
+   fi
+