From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Tue, 5 Feb 2008 16:09:59 +0000 (+0000)
Subject: - not printing ominous warning message: "Unknown effect on other platforms"
X-Git-Tag: bootmanager-3.2-4~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6b0ae75c98557e006c98509be4d4c13e75dd5606;p=bootmanager.git

- not printing ominous warning message: "Unknown effect on other platforms"
- moved 4 second sleep after e1000 unload into module != "" branch
---

diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index 2f1827a..2e7a5da 100644
--- a/source/steps/ChainBootNode.py
+++ b/source/steps/ChainBootNode.py
@@ -204,14 +204,13 @@ def Run( vars, log ):
         for line in modules:
             module= string.strip(line)
             if module == "floppy":
-                log.write("Skipping unload of floppy module for dc7800.\n")
-                log.write("--!! Unknown effect on other platforms !!--\n")
+                log.write("Skipping unload of floppy kernel module.\n")
             elif module != "":
                 log.write( "Unloading %s\n" % module )
                 utils.sysexec_noerr( "modprobe -r %s" % module, log )
-            if module == "e1000":
-                log.write("Unloading e1000 driver; sleeping 4 seconds...\n")
-                time.sleep(4)
+                if module == "e1000":
+                    log.write("Unloading e1000 driver; sleeping 4 seconds...\n")
+                    time.sleep(4)
 
         modules.close()
     except IOError: