ACK
On Wed, 2013-03-20 at 17:26 -0700, Brian C. Lane wrote:
From: "Brian C. Lane" <bcl(a)redhat.com>
dracut needs these mounted so that it sets up the new initrd correctly.
---
blivet/__init__.py | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/blivet/__init__.py b/blivet/__init__.py
index 5da572c..5711c30 100644
--- a/blivet/__init__.py
+++ b/blivet/__init__.py
@@ -2156,13 +2156,14 @@ class FSSet(object):
self._devshm = None
self._usb = None
self._selinux = None
+ self._run = None
self.preserveLines = [] # lines we just ignore and preserve
@property
def sysfs(self):
if not self._sysfs:
self._sysfs = NoDevice(format=getFormat("sysfs",
- device="sys",
+ device="sysfs",
mountpoint="/sys"))
return self._sysfs
@@ -2218,6 +2219,17 @@ class FSSet(object):
return self._selinux
@property
+ def run(self):
+ if not self._run:
+ self._run = DirectoryDevice("/run",
format=getFormat("bind",
+
device="/run",
+
mountpoint="/run",
+ exists=True),
+ exists=True)
+
+ return self._run
+
+ @property
def devices(self):
return sorted(self.devicetree.devices, key=lambda d: d.path)
@@ -2443,7 +2455,7 @@ class FSSet(object):
devices = self.mountpoints.values() + self.swapDevices
devices.extend([self.dev, self.devshm, self.devpts, self.sysfs,
- self.proc, self.selinux, self.usb])
+ self.proc, self.selinux, self.usb, self.run])
devices.sort(key=lambda d: getattr(d.format, "mountpoint", None))
for device in devices:
@@ -2457,7 +2469,7 @@ class FSSet(object):
if "noauto" in options.split(","):
continue
- if device.format.type == "bind" and device != self.dev:
+ if device.format.type == "bind" and device not in [self.dev,
self.run]:
# set up the DirectoryDevice's parents now that they are
# accessible
#
@@ -2500,7 +2512,7 @@ class FSSet(object):
""" unmount filesystems, except swap if swapoff == False
"""
devices = self.mountpoints.values() + self.swapDevices
devices.extend([self.dev, self.devshm, self.devpts, self.sysfs,
- self.proc, self.usb, self.selinux])
+ self.proc, self.usb, self.selinux, self.run])
devices.sort(key=lambda d: getattr(d.format, "mountpoint", None))
devices.reverse()
for device in devices: