2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 35e19c406..876aa3f37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-03  David Cantrell  <dcantrell@redhat.com>
+
+	* lvm.py (has_lvm):  Return if we're on S/390 and don't see a
+	/proc/devices file.
+
 2006-05-03  Jeremy Katz  <katzj@redhat.com>
 
 	* isys/isys.c: Don't include kernel fs headers -- the e2fsprogs
diff --git a/lvm.py b/lvm.py
index 3a57aa10b..5e385fab9 100644
--- a/lvm.py
+++ b/lvm.py
@@ -36,6 +36,9 @@ def has_lvm():
     if not (os.access("/usr/sbin/lvm", os.X_OK) or
             os.access("/sbin/lvm", os.X_OK)):
         return
+
+    if iutil.getArch() == "s390" and not os.access("/proc/devices", os.R_OK):
+        return
     
     f = open("/proc/devices", "r")
     lines = f.readlines()