summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rwxr-xr-xcommand-stubs/mknod-stub3
-rw-r--r--fsset.py3
-rw-r--r--iutil.py2
-rw-r--r--partedUtils.py8
5 files changed, 21 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8bb2b7a9a..0c04a6324 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-20 Jeremy Katz <katzj@redhat.com>
+
+ * command-stubs/mknod-stub (main): Add
+ * partedUtils.py (get_partition_name):
+ * iutil.py (makeDriveDeviceNodes):
+ * fsset.py (prepbootFileSystem.getDiskPart):
+ Promise SX8 devices are of the form /dev/sx8/dpn; support this as
+ needed.
+
2004-12-16 Paul Nasrat <pnasrat@redhat.com>
* loader2/init.c: Extra checking to distinguish hvsi consoles #134397
diff --git a/command-stubs/mknod-stub b/command-stubs/mknod-stub
index 53fd44c17..f4239c75d 100755
--- a/command-stubs/mknod-stub
+++ b/command-stubs/mknod-stub
@@ -26,7 +26,8 @@ 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("i2o")):
+ or drive.startswith("iseries") or drive.startswith("i2o")
+ or drive.startswith("sx8")):
break
drive = drive[drive.find('/') + 1:]
isys.makeDevInode(drive, path)
diff --git a/fsset.py b/fsset.py
index b20d7e2c3..52dcd48d7 100644
--- a/fsset.py
+++ b/fsset.py
@@ -846,7 +846,8 @@ class prepbootFileSystem(FileSystemType):
def getDiskPart(dev):
cut = len(dev)
if (dev.startswith('rd/') or dev.startswith('ida/') or
- dev.startswith('cciss/') or dev.startswith('i2o/')):
+ dev.startswith('cciss/') or dev.startswith('i2o/')
+ or dev.startswith("sx8/")):
if dev[-2] == 'p':
cut = -1
elif dev[-3] == 'p':
diff --git a/iutil.py b/iutil.py
index 6d94655b2..9254fd168 100644
--- a/iutil.py
+++ b/iutil.py
@@ -464,7 +464,7 @@ def makeDriveDeviceNodes():
num = 15
if (drive.startswith("cciss") or drive.startswith("ida") or
- drive.startswith("rd")):
+ drive.startswith("rd") or drive.startswith("sx8")):
sep = "p"
else:
sep = ""
diff --git a/partedUtils.py b/partedUtils.py
index b7d3cabc4..c38d849c6 100644
--- a/partedUtils.py
+++ b/partedUtils.py
@@ -117,6 +117,11 @@ def get_partition_name(partition):
or partition.geom.dev.type == parted.DEVICE_CPQARRAY):
return "%sp%d" % (partition.geom.dev.path[5:],
partition.num)
+ if (parted.__dict__.has_key("DEVICE_SX8") and
+ partition.geom.dev.type == parted.DEVICE_SX8):
+ return "%sp%d" % (partition.geom.dev.path[5:],
+ partition.num)
+
return "%s%d" % (partition.geom.dev.path[5:],
partition.num)
@@ -1099,5 +1104,6 @@ max_logical_partition_count = {
"cciss/": 11,
"i2o/": 11,
"iseries/vd": 3,
- "ida/": 11
+ "ida/": 11,
+ "sx8/": 11,
}