http://cr.opensolaris.org/~dduvall/pkg-devlinks/
This fixes
2349 import of 86 fails on kernel/drv/sd.conf
2839 driver actions should support devlinks
(I needed the first to properly test the second). It's "against" build 97,
so a bunch of new files are in the buil;d 97 directory. Note that they're
copied from build 96 (or earlier) and modified, but I don't have David's
magic to make it look like they were just modified, so I'll explain. For
all but SUNWfixes and SUNWcsd, it's simply adding the devlinks entry to the
associated driver actions. For SUNWfixes and SUNWcsd, here are the diffs:
diff --git a/src/util/distro-import/96/SUNWfixes.prototype
b/src/util/distro-import/97/SUNWfixes.prototype
copy from src/util/distro-import/96/SUNWfixes.prototype
copy to src/util/distro-import/97/SUNWfixes.prototype
--- a/src/util/distro-import/96/SUNWfixes.prototype
+++ b/src/util/distro-import/97/SUNWfixes.prototype
@@ -4,7 +4,6 @@ e none boot/solaris/devicedb/master 0644
e none boot/solaris/devicedb/master 0644 root sys
f none boot/solaris/filelist.ramdisk 0644 root sys
e none etc/X11/gdm/custom.conf 0644 root sys
-e none etc/devlink.tab 0644 root sys
e none etc/driver_aliases 0644 root sys
e none etc/hba.conf 0644 root bin
e none etc/ima.conf 0644 root bin
diff --git a/src/util/distro-import/79b/common/SUNWcsd
b/src/util/distro-import/97/common/SUNWcsd
copy from src/util/distro-import/79b/common/SUNWcsd
copy to src/util/distro-import/97/common/SUNWcsd
--- a/src/util/distro-import/79b/common/SUNWcsd
+++ b/src/util/distro-import/97/common/SUNWcsd
@@ -3,10 +3,9 @@ drop etc/driver_aliases
drop etc/driver_aliases
drop etc/name_to_major
from ./SUNWfixes import
-etc/devlink.tab
etc/driver_aliases
etc/name_to_major
-chattr etc/devlink.tab opensolaris.zone=global
+chattr etc/devlink.tab opensolaris.zone=global preserve=true
chattr etc/driver_aliases opensolaris.zone=global
chattr etc/name_to_major opensolaris.zone=global
end import
This'll allow us to support packages that deliver their own devlink.tab
entries, such as VirtualBox and the Sun Ray Server Software.
I've tested an import (with changes applied to build 96), and an install of
SUNWcsd, SUNWcs, SUNWscm, and SUNWrdc to verify everything works there.
Also an install of build 95 (where devlink.tab is delivered pre-populated)
and upgrading to my build 96, with SUNWscm and SUNWrdc installed before
upgrade, and with them installed after upgrade.
There are some cases that don't work properly because there's no definitive
way to associate a devlink.tab entry with a driver action without it being
part of the action. The other driver attributes can be uniquely
identified, and so we can pretend they were part of the previously
installed driver action, but not this one. I don't think the consequences
are severe, luckily.
Thanks,
Danek
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
