Attachment 713771 Details for Bug 922988 – Proposed patch

[patch] Proposed patch

blivet.patch (text/plain), 3.19 KB, created by Harald Hoyer on 2013-03-21 11:02:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harald Hoyer

Created: 2013-03-21 11:02:09 UTC

Size: 3.19 KB

patch

obsolete

>diff --git a/blivet/__init__.py b/blivet/__init__.py
>index 5da572c..44051cd 100644
>--- a/blivet/__init__.py
>+++ b/blivet/__init__.py
>@@ -1408,7 +1408,7 @@ class Blivet(object):
>         checkSizes = [('/usr', 250), ('/tmp', 50), ('/var', 384),
>                       ('/home', 100), ('/boot', 75)]
>         mustbeonlinuxfs = ['/', '/var', '/tmp', '/usr', '/home', '/usr/share', '/usr/lib']
>-        mustbeonroot = ['/bin','/dev','/sbin','/etc','/lib','/root', '/mnt', 'lost+found', '/proc']
>+        mustbeonroot = ['/bin','/dev','/sbin','/etc','/lib','/root', '/mnt', 'lost+found', '/proc', '/sys', '/run']
> 
>         filesystems = self.mountpoints
>         root = self.fsset.rootDevice
>@@ -2150,6 +2150,7 @@ class FSSet(object):
>         self.origFStab = None
>         self.active = False
>         self._dev = None
>+        self._run = None
>         self._devpts = None
>         self._sysfs = None
>         self._proc = None
>@@ -2162,11 +2163,22 @@ class FSSet(object):
>     def sysfs(self):
>         if not self._sysfs:
>             self._sysfs = NoDevice(format=getFormat("sysfs",
>-                                                    device="sys",
>+                                                    device="sysfs",
>                                                     mountpoint="/sys"))
>         return self._sysfs
> 
>     @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 dev(self):
>         if not self._dev:
>             self._dev = DirectoryDevice("/dev", format=getFormat("bind",
>@@ -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 != self.dev and device != 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:

Actions: View | Diff

Attachments on bug 922988: 712730 | 712788 | 713771 | 713815