diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2005-07-09 21:48:00 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-07-09 21:48:00 +0000 |
| commit | fc625d92999dadb70cf0829f2ecca0be1b6acd7f (patch) | |
| tree | 017758cf4a91a298383c4db1a4738ddbb0bfae17 | |
| parent | Added nosound to README.txt file. This is catalyst 1.1.10.1, the first bugfi... (diff) | |
| download | gentoo-fc625d92999dadb70cf0829f2ecca0be1b6acd7f.tar.gz gentoo-fc625d92999dadb70cf0829f2ecca0be1b6acd7f.tar.bz2 gentoo-fc625d92999dadb70cf0829f2ecca0be1b6acd7f.zip | |
Changed mount check to not use /proc for non-Linux systems. Blame agaffney.
| -rw-r--r-- | src/catalyst/ChangeLog | 6 | ||||
| -rw-r--r-- | src/catalyst/modules/catalyst_support.py | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog index df9d9ee091..19574b99a9 100644 --- a/src/catalyst/ChangeLog +++ b/src/catalyst/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.90 2005/07/08 19:04:48 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.91 2005/07/09 21:48:00 wolf31o2 Exp $ + + 09 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> + modules/catalyst_support.py: + Changed mount check to not use /proc for non-Linux systems. Blame agaffney. 08 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> livecd/files/README.txt: diff --git a/src/catalyst/modules/catalyst_support.py b/src/catalyst/modules/catalyst_support.py index 592b5d9e68..8521662457 100644 --- a/src/catalyst/modules/catalyst_support.py +++ b/src/catalyst/modules/catalyst_support.py @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/catalyst_support.py,v 1.34.2.4 2005/07/07 21:23:10 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/catalyst_support.py,v 1.34.2.5 2005/07/09 21:48:00 wolf31o2 Exp $ import sys,string,os,types,re,traceback @@ -247,12 +247,12 @@ def ismount(path): "enhanced to handle bind mounts" if os.path.ismount(path): return 1 - a=open("/proc/mounts","r") + a=os.popen("mount") mylines=a.readlines() a.close() for line in mylines: mysplit=line.split() - if pathcompare(path,mysplit[1]): + if pathcompare(path,mysplit[2]): return 1 return 0 |