Sue,
Thanks for catching this issue. It should be consistent.
I will change it as follows for both scripts:
# Get the install service's data directory and database path
service_dir = os.path.abspath("/var/ai/" + options.service_name)
# Ensure we are dealing with a new service setup
if not os.path.exists(service_dir):
# compatibility service setup
try:
# txt_record is of the form "aiwebserver=example:46503" so
split
# on ":" and take the trailing portion for the port number
port = svc['txt_record'].rsplit(':')[-1]
except KeyError, err:
parser.error(_("SMF data for service %s is corrupt. Missing "
"property: %s\n") % (options.service_name, err))
service_dir = os.path.abspath("/var/ai/" + port)
This removes the need for libaimdns and installadm_common in the
imports as well.
Thanks,
John
On 01/14/11 10:39 AM, Susan Sohn wrote:
Hi John,
In publish_manifest, line 130 gets the service port using libaimdns.
But in set-criteria, line 229 doesn't use libaimdns at all. Not sure
which is better, but seems like they should be consistent?
Sue
On 01/13/11 07:24 PM, John Fischer wrote:
All,
I have updated the webrev to match the current discussion and
testing.
The significant change is that there is now an impact on DC.
Essentially I introduce a version file into the auto-install
common package. This version file is copied into the generated
ISO .image_file without the comments from the file. This was
needed so that we could tell if the ISO being used for a service
was old or new and act accordingly when setting up a new
service.
The new webrev is available at:
http://cr.opensolaris.org/~johnfisc/webserver/webserver-design-4/
http://cr.opensolaris.org/~johnfisc/webserver/webserver-design-orig-4-diff/
The webrev that tracks the differences between review round 3 and
round 4 is located at:
http://cr.opensolaris.org/~johnfisc/webserver/webserver-design-diff-3-4/
Thanks,
John
_______________________________________________
caiman-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/caiman-discuss
_______________________________________________
caiman-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/caiman-discuss
