mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-06 11:41:52 +00:00
Code Issues Releases Activity

* Do not probe disc media unless the media is known to contain data

Browse Source 
* Be less conservation about which device nodes are mountable volumes

These patches were tested together by mezz, and individually by
Andriy Gapon and Andreas Wetzel respectively.
This commit is contained in:
Joe Marcus Clarke 2008-04-13 23:38:02 +00:00
parent 1b796ad4e6
commit 22e5d827b5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=211199
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysutils/hal/Makefile
View File

@ -8,7 +8,7 @@
PORTNAME= hal
DISTVERSION= 0.5.11rc2
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/

12
sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c Normal file
View File

@ -0,0 +1,12 @@
--- hald/freebsd/probing/probe-volume.c.orig 2008-04-07 00:41:22.000000000 -0400
+++ hald/freebsd/probing/probe-volume.c 2008-04-07 00:43:32.000000000 -0400
@@ -502,7 +502,8 @@ main (int argc, char **argv)
hfp_cdrom_free(cdrom);
}
- if (has_data)
+ if (has_data && vid && (! strcmp(vid->type, "iso9660") ||
+ ! strcmp(vid->type, "udf")))
hf_probe_volume_advanced_disc_detect(fd);
}
else

18
sysutils/hal/files/patch-hald_hf-storage.c Normal file
View File

@ -0,0 +1,18 @@
--- hald/freebsd/hf-storage.c.orig 2008-04-07 00:40:06.000000000 -0400
+++ hald/freebsd/hf-storage.c 2008-04-07 00:40:37.000000000 -0400
@@ -117,6 +117,7 @@ hf_storage_geom_has_partitions (const Ge
if (g_node_n_children(node) > 0)
return TRUE;
+ /*
if (hf_storage_class_is_partitionable(geom_obj->class) &&
g_node_next_sibling(node) != NULL)
{
@@ -135,6 +136,7 @@ hf_storage_geom_has_partitions (const Ge
return TRUE;
}
}
+ */
return FALSE;
}