merge from taroon-branch. all kinds of miscellaneous bugfixes, including

* firewall update
* iSeries PReP size
* ppc mediacheck
* tzdata stuff
* cmdline mode
* pkg defaults screen

1 files changed, 3 insertions, 0 deletions

diff --git a/fsset.py b/fsset.py
index 87a6f1a0c..0af5e14be 100644
--- a/fsset.py
+++ b/fsset.py
@@ -757,6 +757,9 @@ class prepbootFileSystem(FileSystemType):
         self.name = "PPC PReP Boot"
         self.maxSizeMB = 10
 
+        if iutil.getPPCMachine() == "iSeries":
+            self.maxSizeMB = 64
+
         # supported for use on the pseries
         if (iutil.getPPCMachine() == "pSeries" or
             iutil.getPPCMachine() == "iSeries"):