revert previous commit for deployment tag.

[bootmanager.git] / source / steps / CheckHardwareRequirements.py

diff --git a/source/steps/CheckHardwareRequirements.py b/source/steps/CheckHardwareRequirements.py
index 43caa43..0c3e582 100644 (file)
--- a/source/steps/CheckHardwareRequirements.py
+++ b/source/steps/CheckHardwareRequirements.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 
 # Copyright (c) 2003 Intel Corporation
 # All rights reserved.
@@ -40,7 +40,6 @@ def Run( vars, log ):
                             this node to be usable after install
     SKIP_HARDWARE_REQUIREMENT_CHECK
                             If set, don't check if minimum requirements are met
-    BOOT_CD_VERSION          A tuple of the current bootcd version                            
     Sets the following variables:
     INSTALL_BLOCK_DEVICES    list of block devices to install onto
     """
@@ -64,10 +63,6 @@ def Run( vars, log ):
         SKIP_HARDWARE_REQUIREMENT_CHECK= \
                    int(vars["SKIP_HARDWARE_REQUIREMENT_CHECK"])
         
-        BOOT_CD_VERSION= vars["BOOT_CD_VERSION"]
-        if BOOT_CD_VERSION == "":
-            raise ValueError, "BOOT_CD_VERSION"
-
     except KeyError, var:
         raise BootManagerException, \
               "Missing variable in install store: %s" % var
@@ -93,20 +88,13 @@ def Run( vars, log ):
             
             sent= 0
             try:
-                #sent= BootAPI.call_api_function( vars, "BootNotifyOwners",
-                #                         (notify_messages.MSG_INSUFFICIENT_MEMORY,
-                #                          include_pis,
-                #                          include_techs,
-                #                          include_support) )
-                person_ids = BootAPI.call_api_function( vars, "GetSites", 
-                sent= BootAPI.call_api_function( vars, "NotifyPersons",
+                sent= BootAPI.call_api_function( vars, "BootNotifyOwners",
                                          (notify_messages.MSG_INSUFFICIENT_MEMORY,
                                           include_pis,
                                           include_techs,
                                           include_support) )
- 
             except BootManagerException, e:
-                log.write( "Call to NotifyPersons failed: %s.\n" % e )
+                log.write( "Call to BootNotifyOwners failed: %s.\n" % e )
                 
             if sent == 0:
                 log.write( "Unable to notify site contacts of problem.\n" )
@@ -256,10 +244,4 @@ def Run( vars, log ):
             
     log.write( "Total size for all usable block devices: %4.2f GB\n" % total_size )
 
-    # turn off UDMA for all block devices on 2.x cds (2.4 kernel)
-    if BOOT_CD_VERSION[0] == 2:
-        for device in install_devices:
-            log.write( "Disabling UDMA on %s\n" % device )
-            utils.sysexec_noerr( "/sbin/hdparm -d0 %s" % device, log )
-
     return 1