In order to fix the issue that "pkg verify" fails verification on libc on
x86 (and in order to avoid the more extensive changes that allow us to
discover mountpoints on the fly), we need to label files which are
mountpoints as such. There is a corresponding change to ON to put
"mountpoint=true" on /lib/libc.so.1 for x86. The changes to the packaging
system are almost as simple:
18903 support for mountpoint labeling
diff --git a/src/modules/actions/file.py b/src/modules/actions/file.py
--- a/src/modules/actions/file.py
+++ b/src/modules/actions/file.py
@@ -334,9 +334,10 @@ class FileAction(generic.Action):
# Check file contents
#
try:
+ is_mtpt = self.attrs.get("mountpoint", "").lower()
== "true"
elfhash = None
elferror = None
- if "elfhash" in self.attrs and haveelf:
+ if "elfhash" in self.attrs and haveelf and not
is_mtpt:
#
# It's possible for the elf module to
# throw while computing the hash,
@@ -361,7 +362,7 @@ class FileAction(generic.Action):
# matches, it indicates that the content hash
algorithm
# changed, since obviously the file hash is a
superset
# of the content hash.
- if elfhash is None or elferror:
+ if (elfhash is None or elferror) and not is_mtpt:
hashvalue, data =
misc.get_data_digest(path)
if hashvalue != self.hash:
# Prefer the content hash error
message.
Thanks,
Danek
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
