[master 26/30] Move kernel_filesystems functionality into a little library.
mulkieran
installerbot-noreply at redhat.com
Wed Mar 25 22:48:04 UTC 2015
From: mulhern <amulhern at redhat.com>
This way, tasks can know what the kernel filesystems are if they need to.
Move it up a directory, so tasks and formats can share.
Signed-off-by: mulhern <amulhern at redhat.com>
---
blivet/devicetree.py | 3 ++-
blivet/formats/fs.py | 14 ++------------
blivet/fslib.py | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 38 insertions(+), 13 deletions(-)
create mode 100644 blivet/fslib.py
diff --git a/blivet/devicetree.py b/blivet/devicetree.py
index 5a7aa0c..3320c1d 100644
--- a/blivet/devicetree.py
+++ b/blivet/devicetree.py
@@ -31,6 +31,7 @@
from .deviceaction import ActionDestroyDevice, ActionDestroyFormat
from .devices import BTRFSDevice, DASDDevice, NoDevice, PartitionDevice
from . import formats
+from .fslib import nodev_filesystems
from .devicelibs import lvm
from .devicelibs import edd
from . import udev
@@ -970,7 +971,7 @@ def handleNodevFilesystems(self):
except ValueError:
log.error("failed to parse /proc/mounts line: %s", line)
continue
- if fstype in formats.fs.nodev_filesystems:
+ if fstype in nodev_filesystems:
if not flags.include_nodev:
continue
diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
index 3d7cae4..101c4c3 100644
--- a/blivet/formats/fs.py
+++ b/blivet/formats/fs.py
@@ -41,21 +41,11 @@
from .. import udev
from ..mounts import mountsCache
+from ..fslib import kernel_filesystems, update_kernel_filesystems
+
import logging
log = logging.getLogger("blivet")
-kernel_filesystems = []
-nodev_filesystems = []
-
-def update_kernel_filesystems():
- for line in open("/proc/filesystems").readlines():
- fields = line.split()
- kernel_filesystems.append(fields[-1])
- if fields[0] == "nodev":
- nodev_filesystems.append(fields[-1])
-
-update_kernel_filesystems()
-
class FS(DeviceFormat):
""" Filesystem base class. """
_type = "Abstract Filesystem Class" # fs type name
diff --git a/blivet/fslib.py b/blivet/fslib.py
new file mode 100644
index 0000000..092439d
--- /dev/null
+++ b/blivet/fslib.py
@@ -0,0 +1,34 @@
+# fslib.py
+# Library to support filesystem classes.
+#
+# Copyright (C) 2015 Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details. You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA. Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Dave Lehman <dlehman at redhat.com>
+# David Cantrell <dcantrell at redhat.com>
+# Anne Mulhern <amulhern at redhat.com>
+
+kernel_filesystems = []
+nodev_filesystems = []
+
+def update_kernel_filesystems():
+ for line in open("/proc/filesystems").readlines():
+ fields = line.split()
+ kernel_filesystems.append(fields[-1])
+ if fields[0] == "nodev":
+ nodev_filesystems.append(fields[-1])
+
+update_kernel_filesystems()
--
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/303cb32162e8933bda9e1a6a5b7d1ff3997caef4
More information about the anaconda-patches
mailing list