some i2o fixes from warren & markus

4 files changed, 4 insertions, 3 deletions

diff --git a/command-stubs/mknod-stub b/command-stubs/mknod-stub
index f7491eabf..53fd44c17 100755
--- a/command-stubs/mknod-stub
+++ b/command-stubs/mknod-stub
@@ -26,7 +26,7 @@ def main():
         while (drive.find('/') != -1):
             if (drive.startswith("cciss") or drive.startswith("ida") or
                 drive.startswith("rd") or drive.startswith("ataraid")
-                or drive.startswith("iseries")):
+                or drive.startswith("iseries") or drive.startswith("i2o")):
                 break
             drive = drive[drive.find('/') + 1:]
         isys.makeDevInode(drive, path)
diff --git a/fsset.py b/fsset.py
index bfa2b888e..56c7cd0f7 100644
--- a/fsset.py
+++ b/fsset.py
@@ -810,7 +810,7 @@ class prepbootFileSystem(FileSystemType):
         def getDiskPart(dev):
             cut = len(dev)
             if (dev.startswith('rd/') or dev.startswith('ida/') or
-                dev.startswith('cciss/')):
+                dev.startswith('cciss/') or dev.startswith('i2o/')):
                 if dev[-2] == 'p':
                     cut = -1
                 elif dev[-3] == 'p':
diff --git a/iutil.py b/iutil.py
index 7aa0755bd..776e4b842 100644
--- a/iutil.py
+++ b/iutil.py
@@ -455,7 +455,7 @@ def makeDriveDeviceNodes():
             num = 15
 
         if (drive.startswith("cciss") or drive.startswith("ida") or
-            drive.startswith("rd")):
+            drive.startswith("rd") or drive.startswith("i2o")):
             sep = "p"
         else:
             sep = ""
diff --git a/partedUtils.py b/partedUtils.py
index dfa334f46..fa3072554 100644
--- a/partedUtils.py
+++ b/partedUtils.py
@@ -1065,6 +1065,7 @@ max_logical_partition_count = {
     "ataraid/": 11,
     "rd/": 3,
     "cciss/": 11,
+    "i2o/", 11,
     "iseries/vd": 3,
     "ida/": 11
 }