summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Zeuthen <davidz@redhat.com>2010-03-11 14:21:02 -0500
committerDavid Zeuthen <davidz@redhat.com>2010-03-11 14:21:02 -0500
commitb51dc7ac853ec3f11735a0e893dfe11365f14ee2 (patch)
treea31819f5ba185fc3f2457564e9c24255609ea6a7
parent1d50b6a696b7704de102fce1d719d57d57cae891 (diff)
Revert "Bug 26996 — wrongly detects partition on unpartitioned VFAT device"
This commit actually broke partition table parsing for the partitions itself, e.g. this output UDISKS_PARTITION=1 UDISKS_PARTITION_SCHEME=mbr UDISKS_PARTITION_NUMBER=1 UDISKS_PARTITION_TYPE=0x83 UDISKS_PARTITION_SIZE=51202335744 UDISKS_PARTITION_LABEL= UDISKS_PARTITION_UUID= UDISKS_PARTITION_FLAGS=boot UDISKS_PARTITION_SLAVE=/sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda UDISKS_PARTITION_OFFSET=32256 UDISKS_PARTITION_ALIGNMENT_OFFSET=0 if the partition in question had a recognizable filesystem. This reverts commit cfc669846a53815517d32d0b7b96cbc4935cea7a.
-rw-r--r--data/80-udisks.rules6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/80-udisks.rules b/data/80-udisks.rules
index e9b5caf..212d34e 100644
--- a/data/80-udisks.rules
+++ b/data/80-udisks.rules
@@ -80,9 +80,9 @@ KERNEL=="hd*[0-9]", ATTR{removable}=="1", GOTO="probe_parttable_end"
# don't scan for partition tables on empty discs
KERNEL=="sr*", ENV{ID_CDROM_MEDIA}!="?*", GOTO="probe_parttable_end"
-# scan for partition tables both on whole-disk and partitions, unless we
-# already know that there is a file system
-ENV{ID_FS_TYPE}=="", IMPORT{program}="udisks-part-id $tempnode"
+# scan for partition tables both on whole-disk and partitions
+#
+IMPORT{program}="udisks-part-id $tempnode"
LABEL="probe_parttable_end"