usbmount-fstype-detection-fix.patch 1.0 KB

12345678910111213141516171819202122232425
  1. newer blkid version shows two parameter with TYPE within:
  2. /dev/sda1: VERSION="0.0" TYPE="ext2" USAGE="filesystem" PART_ENTRY_SCHEME="dos"
  3. PART_ENTRY_TYPE="0xc" PART_ENTRY_FLAGS="0x80" PART_ENTRY_NUMBER="1"
  4. change regular expression to take " TYPE" only
  5. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
  6. ---
  7. usbmount | 2 +-
  8. 1 file changed, 1 insertion(+), 1 deletion(-)
  9. Index: b/usbmount
  10. ===================================================================
  11. --- a/usbmount
  12. +++ b/usbmount
  13. @@ -88,7 +88,7 @@
  14. # FIXME: improvement: implement mounting by label (notice that labels
  15. # can contain spaces, which makes things a little bit less comfortable).
  16. DEVINFO=$(/sbin/blkid -p $DEVNAME)
  17. - FSTYPE=$(echo "$DEVINFO" | sed 's/.*TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
  18. + FSTYPE=$(echo "$DEVINFO" | sed 's/.* TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
  19. UUID=$(echo "$DEVINFO" | sed 's/.*UUID="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
  20. USAGE=$(echo "$DEVINFO" | sed 's/.*USAGE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')