Clay,
My comments on the new diffs are the the bottom of your
comments. I've responded to your comments where appropriate
and removed stuff that is answered. Thanks for letting me
know about why assuming multihomed is fine, [[]] and function
names.
So is /usr/bin/ai_sd the replacement dns_sd?
Anything left over I trust that you'll do what is right.
Thanks,
John
On 07/18/10 07:53 PM, [email protected] wrote:For me the formating
of the file was easier to read before.
print_dhcp_macro_info seem more descriptive then
print_service_macro_info.
Ah, I see you separated out the message(s) into 2 functions. In that
case
lines 150-155 are duplicate output to lines 181-186. Would the customer
ever see both sets of messages? If so then perhaps reworking the
messages
some more is in order. Don't want to nag the customer. :-)
If you are running the Solaris DHCP server, use the following
....
If you are running the Solaris DHCP server, use the following
....
Yes, there is some nagging going on. It's possible to get one set or
the other. What would you envision as a better format? (Certainly,
there should be one!)
Perhaps breaking up the information into several functions and setting
flags for final output processing.
Currently:
------------------------------------------------------------------------
[from print_service_macro():]
Setting up the target image at /var/ai/install_test_ai_sparc ...
If not already configured, please create a DHCP macro
named 10.10.1.25 with:
Boot server IP (BootSrvA) : 10.10.1.25
If you are running the Solaris DHCP Server, use the following
command to add the DHCP macro, 10.10.1.0:
/usr/sbin/dhtadm -g -A -m 10.10.1.0 -d :BootSrvA=10.10.1.25:
Note: Be sure to assign client IP address(es) if needed
(e.g., if running the Solaris DHCP Server, run pntadm(1M)).
Setting up the target image at /var/ai/install_test_ai_sparc ...
If not already configured, please create a DHCP macro
named 172.20.24.0 with:
Boot server IP (BootSrvA) : 172.20.24.78
If you are running the Solaris DHCP Server, use the following
command to add the DHCP macro, 172.20.24.0:
/usr/sbin/dhtadm -g -A -m 172.20.24.0 -d :BootSrvA=172.20.24.78:
Note: Be sure to assign client IP address(es) if needed
(e.g., if running the Solaris DHCP Server, run pntadm(1M)).
Setting up the target image at /var/ai/install_test_ai_sparc ...
If not already configured, please create a DHCP macro
named 192.168.1.0 with:
Boot server IP (BootSrvA) : 192.168.1.1
If you are running the Solaris DHCP Server, use the following
command to add the DHCP macro, 192.168.1.0:
/usr/sbin/dhtadm -g -A -m 192.168.1.0 -d :BootSrvA=192.168.1.1:
Note: Be sure to assign client IP address(es) if needed
(e.g., if running the Solaris DHCP Server, run pntadm(1M)).
Detected that DHCP is not set up on this server.
If not already configured, please create a DHCP macro
named dhcp_macro_install_test_ai_x86 with:
Boot file (BootFile) : install_test_ai_x86
If you are running the Solaris DHCP Server, use the following
command to add the DHCP macro, dhcp_macro_install_test_ai_x86:
/usr/sbin/dhtadm -g -A -m dhcp_macro_install_test_ai_x86 -d
:BootFile=install
Note: Be sure to assign client IP address(es) if needed
(e.g., if running the Solaris DHCP Server, run pntadm(1M)).
-------------------------------------------------------------------
Perhaps better:
-------------------------------------------------------------------
Setting up the target image at /var/ai/install_test_ai_sparc ...
If not already configured, please use dhtadm(1) to create or updated
the following DHCP macros:
Macro name Options
10.10.1.0 Update with: BootSrvA=10.10.1.25
172.20.24.0 Update with: BootSrvA=172.20.24.78
192.168.1.0 Update with: BootSrvA=192.168.1.1
dhcp_macro_install_test_ai_x86 Create with:
BootFile=install_test_ai_x86
Though this would not provide as detailed of information as we
previously have, I don't think we do want to be as detailed for every
macro when multihomed systems can require a plethora of macro changes?
That would work as well.
--------------------------------------
ai_sd.py
--------------------------------------
Is there a time when dhcp_stderr is null and
svc_address is 'non useful'? If so then the
code below would give a weird error. If not
then there is an extra check.
407 # check if we got an error or if we got no useful response
408 if dhcp_stderr or not svc_address:
409 AISD_LOG.post(AILog.AI_DBGLVL_ERR,
410 "Couldn't find BootSrvA record in DHCP;
error %s",
411 dhcp_stderr)
412 return 2
Might produce:
Couldn't find BootSrvA record in DHCP; error
Also as Dave pointed out the contraction is
undesirable.
--------------------------------------
manifest-locator
--------------------------------------
Dave probably caught this contraction as well:
126 if [ ! -x $AISD_ENGINE ] ; then
127 print "Couldn't find Auto Installer Service
Discovery Engine" |
128 $TEE_LOGTOCONSOLE
129 return 1
130 fi
172 if [ ! -x $AISC_ENGINE ] ; then
173 print "Couldn't find Auto Installer Service
Choosing Engine" |
174 $TEE_LOGTOCONSOLE
175 return 1
176 fi
183 if [ $? -ne 0 ] ; then
184 print "Couldn't obtain valid configuration manifest" |
185 $TEE_LOGTOCONSOLE
186 return 1
187 fi
----------------------------------------
installadm-common.sh
----------------------------------------
Dave probably caught this contraction too:
744 else
745 print "Couldn't determine service
location, fallback " \
746 "mechanism will not be available"
747 fi
-----------------------------------------
setup-dhcp.sh
-----------------------------------------
Again, not a fan of having comments interspersed within
a command. It makes reading what you are doing more difficult.
498 server_ip=$(ipadm show-addr -p -o ADDROBJ,ADDR | \
499 $GREP -v "\\\:"|$GREP "^${interface}/")
500 # strip off interface name - string should be of
the form:
501 # e1000g1/_a:192.168.1.1/24
502 server_ip=${server_ip/#$interface*:/}
503 # strip off trailing netmask - string should be of
the form:
504 # 192.168.1.1/24
505 server_ip=${server_ip/%\/[0-9]*/}
_______________________________________________
caiman-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/caiman-discuss
