[arch-releng] [PATCH 08/13] Add -p to blkid in hooks, to bypass the cache like in udev rules.

Gerardo Exequiel Pozzi vmlinuz386 at yahoo.com.ar
Tue Mar 16 07:29:18 CET 2010


Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
---
 archiso/hooks/archiso       |    2 +-
 archiso/hooks/archiso_early |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso
index 73f4df9..c1821d4 100644
--- a/archiso/hooks/archiso
+++ b/archiso/hooks/archiso
@@ -89,7 +89,7 @@ archiso_mount_handler() {
         launch_interactive_shell
     done
 
-    FSTYPE=$(blkid -o value -s TYPE ${archisodevice} 2> /dev/null)
+    FSTYPE=$(blkid -o value -s TYPE -p ${archisodevice} 2> /dev/null)
     if [ -n "${FSTYPE}" ]; then
         if mount -r -t "${FSTYPE}" ${archisodevice} /bootmnt > /dev/null 2>&1; then
             if [ -e "${isomounts}" ]; then
diff --git a/archiso/hooks/archiso_early b/archiso/hooks/archiso_early
index edd554b..465e105 100644
--- a/archiso/hooks/archiso_early
+++ b/archiso/hooks/archiso_early
@@ -2,7 +2,7 @@
 run_hook ()
 {
   if [ -n "${archisolabel}" ]; then
-    echo "ACTION==\"add|change\", SUBSYSTEM==\"block\", IMPORT{program}=\"/sbin/blkid -o udev \$tempnode\"" > /lib/udev/rules.d/00-archiso-device.rules
+    echo "ACTION==\"add|change\", SUBSYSTEM==\"block\", IMPORT{program}=\"/sbin/blkid -o udev -p \$tempnode\"" > /lib/udev/rules.d/00-archiso-device.rules
     echo "ENV{ID_FS_LABEL_ENC}==\"${archisolabel}\", SYMLINK+=\"archiso\"" >> /lib/udev/rules.d/00-archiso-device.rules
   fi
 }
-- 
1.7.0.2




More information about the arch-releng mailing list