- merge revision 1.3

date: 2005/10/26 15:26:15;  author: mlhuang;  state: Exp;  lines: +1 -1
for the old style boot server file, that contains multiple servers,
read only the first line

diff --git a/source/steps/InitializeBootManager.py b/source/steps/InitializeBootManager.py
index 076a637..97de995 100644 (file)
--- a/source/steps/InitializeBootManager.py
+++ b/source/steps/InitializeBootManager.py
@@ -58,7 +58,7 @@ def Run( vars, log ):
     # info in /usr/bootme; 3.x cds in /usr/boot
     if BOOT_CD_VERSION[0] == 2:
         try:
-            boot_server= file(V2X_BOOTCD_SERVER_FILE).read().strip()                
+            boot_server= file(V2X_BOOTCD_SERVER_FILE).readline().strip()                
         except IOError:
             raise BootManagerException, \
                   "It appears we are running on a v2.x boot cd, but could " \