12078 fix_browser_home_page() ICT task is no-op, could be removed
authorKeith Mitchell <keith.mitchell@oracle.com>
Mon, 09 Aug 2010 13:43:53 -0700
changeset 858 21440f082500
parent 857 d2f0392a5544
child 859 e9ed0d564fad
12078 fix_browser_home_page() ICT task is no-op, could be removed
usr/src/cmd/slim-install/finish/install-finish
usr/src/lib/libict_pymod/ict.py
--- a/usr/src/cmd/slim-install/finish/install-finish	Mon Aug 09 13:36:04 2010 -0700
+++ b/usr/src/cmd/slim-install/finish/install-finish	Mon Aug 09 13:43:53 2010 -0700
@@ -174,7 +174,6 @@
         #ICTs ported from Transfer Module
         SA.append(ICTO.create_smf_repository())
         #ICTs ported from original install-finish
-        SA.append(ICTO.fix_browser_home_page())
         SA.append(ICTO.set_partition_active())
         SA.append(ICTO.update_dumpadm_nodename())
         SA.append(ICTO.setup_dev_namespace())
@@ -194,7 +193,6 @@
         #ICTs ported from original install-finish
         SA.append(ICTO.set_boot_device_property())
         SA.append(ICTO.add_splash_image_to_grub_menu())
-        SA.append(ICTO.fix_browser_home_page())
         SA.append(ICTO.set_partition_active())
         SA.append(ICTO.remove_bootpath())
         SA.append(ICTO.fix_grub_entry())
@@ -228,7 +226,6 @@
     if not IS_SPARC:
         SA.append(ICTO.set_boot_device_property())
         SA.append(ICTO.add_splash_image_to_grub_menu())
-    SA.append(ICTO.fix_browser_home_page())
     SA.append(ICTO.remove_livecd_coreadm_conf())
     SA.append(ICTO.set_partition_active())
     if not IS_SPARC:
--- a/usr/src/lib/libict_pymod/ict.py	Mon Aug 09 13:36:04 2010 -0700
+++ b/usr/src/lib/libict_pymod/ict.py	Mon Aug 09 13:43:53 2010 -0700
@@ -164,7 +164,6 @@
 ICT_SYSIDTOOL_ENTRIES_FAILED,
 ICT_SYSIDTOOL_CP_STATE_FAILED,
 ICT_SET_FLUSH_CONTENT_CACHE_ON_SUCCESS_FAILED,
-ICT_FIX_BROWSER_HOME_PAGE_FAILED,
 ICT_FIX_GRUB_ENTRY_FAILED,
 ICT_CREATE_SPARC_BOOT_MENU_FAILED,
 ICT_COPY_SPARC_BOOTLST_FAILED,
@@ -1661,65 +1660,6 @@
                 return status
         return 0
 
-    #set web browser home page
-    #return 0 for success, otherwise error code
-    def fix_browser_home_page(self):
-        '''ICT - The default browser home page on the live CD provides
-        installation information. After installation a different page
-        provides information for what else the user can or should do.
-
-        edit browser.startup.homepage in
-        /usr/lib/firefox/browserconfig.properties
-
-        return 0 on success, error code otherwise
-        '''
-        browsercfg = self.basedir + \
-            '/usr/lib/firefox/browserconfig.properties'
-        browser_install_status = os.path.exists(browsercfg)
-        if browser_install_status:
-            _register_task(inspect.currentframe())
-            index_url = 'file:///usr/share/doc/opensolaris-welcome/' + \
-                'html/index.html'
-            try:
-                (fp, tmpbrowsercfg) = tempfile.mkstemp('.properties',
-                                                       'browserconfig', '/tmp')
-                os.close(fp)
-            except OSError, (errno, strerror):
-                prerror('I/O error in creating temporary file for web ' +
-                        'browser configuration: ' + strerror)
-                prerror('Failure. Returning: ICT_FIX_BROWSER_HOME_PAGE_FAILED')
-                return ICT_FIX_BROWSER_HOME_PAGE_FAILED
-            except StandardError:
-                prerror('Unrecognized error - Unable to fix browser home page')
-                prerror(traceback.format_exc())
-                prerror('Failure. Returning: ICT_FIX_BROWSER_HOME_PAGE_FAILED')
-                return ICT_FIX_BROWSER_HOME_PAGE_FAILED
-            sedcmd = 'sed -e \'s+browser.startup.homepage=' + \
-                     '.*$+browser.startup.homepage=' + \
-                      index_url + '+\' ' + \
-                      '-e \'s+browser.startup.homepage_reset=' + \
-                      '.*$+browser.startup.homepage_reset=' + \
-                      index_url + \
-                      '+\' '+ browsercfg + ' > '+ tmpbrowsercfg
-            status = _cmd_status(sedcmd)
-            if (status != 0):
-                prerror('Setting browser home page command failed. ' +
-                        'exit status=' + str(status))
-                prerror('Failed command was ' + sedcmd)
-                prerror('Failure. Returning: ICT_FIX_BROWSER_HOME_PAGE_FAILED')
-                return ICT_FIX_BROWSER_HOME_PAGE_FAILED
-            if not _move_in_updated_config_file(tmpbrowsercfg, browsercfg):
-                prerror('Could not update browser configuration file ' +
-                        browsercfg)
-                prerror('Failure. Returning: ICT_FIX_BROWSER_HOME_PAGE_FAILED')
-                return ICT_FIX_BROWSER_HOME_PAGE_FAILED
-            return 0
-        else:
-            info_msg('Skipping fix_browser_home_page() ICT task as ' +
-                     '/usr/lib/firefox/browserconfig.properties does ' +
-                     'not exist')
-            return 0
-
     def remove_livecd_coreadm_conf(self):
         '''ICT - Remove LiveCD-specific /etc/coreadm.conf config file.
         Coreadm will create its initial configuration on first boot