--- a/usr/src/cmd/installadm/delete_service.py	Wed Jul 13 04:30:18 2011 -0400
+++ b/usr/src/cmd/installadm/delete_service.py	Thu Jul 14 19:43:46 2011 -0700
@@ -102,7 +102,6 @@
         # the default for this architecture, unset it.
         try:
             arch_class = dhcp.DHCPArchClass.get_arch(server, service.arch)
-            bootfile = arch_class.bootfile
         except dhcp.DHCPServerError as err:
             print >> sys.stderr, cw(_("\nUnable to access DHCP configuration: "
                                       "%s\n" % err))

--- a/usr/src/cmd/installadm/installadm_common.py	Wed Jul 13 04:30:18 2011 -0400
+++ b/usr/src/cmd/installadm/installadm_common.py	Thu Jul 14 19:43:46 2011 -0700
@@ -182,7 +182,7 @@
     whitespace (as might be seen with a block-quoted string), and it is then
     line-wrapped at 70 characters.
     """
-    return ("\n".join(map(_text_wrap, text.splitlines())))
+    return ("\n".join(map(_text_wrap, text.splitlines())) + "\n")
 
 
 #