summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-03-06 19:12:04 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-03-06 19:12:04 -0300
commit4609c1c2d0358e5f004861c6d1932f3802412f61 (patch)
treeb3014f02caba4427aed44f37a724d56e902b08c8
parentd38f1d1460ae94393184c00cf2e8a55a7f4e077f (diff)
downloadarchiso32-4609c1c2d0358e5f004861c6d1932f3802412f61.tar.xz
Add -p to blkid in hooks, to bypass the cache like in udev rules.
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-rw-r--r--archiso/hooks/archiso2
-rw-r--r--archiso/hooks/archiso_early2
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
}