Detangled steps. No step makes calls into another step.

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

diff --git a/source/steps/CheckHardwareRequirements.py b/source/steps/CheckHardwareRequirements.py
index bff14f2..7739f73 100644 (file)
--- a/source/steps/CheckHardwareRequirements.py
+++ b/source/steps/CheckHardwareRequirements.py
@@ -1,50 +1,17 @@
+#!/usr/bin/python2
+
 # Copyright (c) 2003 Intel Corporation
 # All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-
-#     * Neither the name of the Intel Corporation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# EXPORT LAWS: THIS LICENSE ADDS NO RESTRICTIONS TO THE EXPORT LAWS OF
-# YOUR JURISDICTION. It is licensee's responsibility to comply with any
-# export regulations applicable in licensee's jurisdiction. Under
-# CURRENT (May 2000) U.S. export regulations this software is eligible
-# for export from the U.S. and can be downloaded by or otherwise
-# exported or reexported worldwide EXCEPT to U.S. embargoed destinations
-# which include Cuba, Iraq, Libya, North Korea, Iran, Syria, Sudan,
-# Afghanistan and any other country to which the U.S. has embargoed
-# goods and services.
-
+#
+# Copyright (c) 2004-2006 The Trustees of Princeton University
+# All rights reserved.
+# expected /proc/partitions format
 
 import os
 import popen2
 import string
 
-from systeminfo import systeminfo
+import systeminfo
 from Exceptions import *
 import utils
 import notify_messages
@@ -108,12 +75,10 @@ def Run( vars, log ):
         raise BootManagerException, \
               "Variable in install store blank, shouldn't be: %s" % var
 
-    sysinfo= systeminfo()
-    
     # lets see if we have enough memory to run
     log.write( "Checking for available memory.\n" )
 
-    total_mem= sysinfo.get_total_phsyical_mem()
+    total_mem= systeminfo.get_total_phsyical_mem(vars, log)
     if total_mem is None:
         raise BootManagerException, "Unable to read total physical memory"
         
@@ -152,7 +117,7 @@ def Run( vars, log ):
 
     # get a list of block devices to attempt to install on
     # (may include cdrom devices)
-    install_devices= sysinfo.get_block_device_list()
+    install_devices= systeminfo.get_block_device_list(vars, log)
 
     # save the list of block devices in the log
     log.write( "Detected block devices:\n" )