Attachment 609603 Details for Bug 835633 – [PATCH] fix state start/finish mismatch on 'device setup'

[patch] [PATCH] fix state start/finish mismatch on 'device setup'

0001-fix-state-start-finish-mismatch-on-device-setup.patch (text/plain), 5.70 KB, created by Mathieu Bridon on 2012-09-04 09:09:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Bridon

Created: 2012-09-04 09:09:07 UTC

Size: 5.70 KB

patch

obsolete

>From cbc805a335ff2a1951e37bed5ed5bf9bbc54196b Mon Sep 17 00:00:00 2001
>From: Mathieu Bridon <bochecha@fedoraproject.org>
>Date: Tue, 4 Sep 2012 17:03:21 +0800
>Subject: [PATCH] fix state start/finish mismatch on 'device setup'
>
>If an error happens while trying to setup /dev, the exception
>was raised to the caller, which would handle it by finishing
>its own state.
>
>As such, 'device setup' was never finished.
>
>This commit makes sure that _setupDev() itself takes care of
>finishing 'device setup', while still raising the exception
>upwards so the caller can do what it needs done.
>---
> py/mockbuild/backend.py |   92 ++++++++++++++++++++++++----------------------
> 1 files changed, 48 insertions(+), 44 deletions(-)
>
>diff --git a/py/mockbuild/backend.py b/py/mockbuild/backend.py
>index 9b4c6ca..31e768f 100644
>--- a/py/mockbuild/backend.py
>+++ b/py/mockbuild/backend.py
>@@ -423,50 +423,54 @@ class Root(object):
>     decorate(traceLog())
>     def _setupDev(self, interactive=False):
>         self.start("device setup")
>-        # files in /dev
>-        mockbuild.util.rmtree(self.makeChrootPath("dev"), selinux=self.selinux)
>-        mockbuild.util.mkdirIfAbsent(self.makeChrootPath("dev", "pts"))
>-        mockbuild.util.mkdirIfAbsent(self.makeChrootPath("dev", "shm"))
>-        prevMask = os.umask(0000)
>-        devFiles = [
>-            (stat.S_IFCHR | 0666, os.makedev(1, 3), "dev/null"),
>-            (stat.S_IFCHR | 0666, os.makedev(1, 7), "dev/full"),
>-            (stat.S_IFCHR | 0666, os.makedev(1, 5), "dev/zero"),
>-            (stat.S_IFCHR | 0666, os.makedev(1, 8), "dev/random"),
>-            (stat.S_IFCHR | 0444, os.makedev(1, 9), "dev/urandom"),
>-            (stat.S_IFCHR | 0666, os.makedev(5, 0), "dev/tty"),
>-            (stat.S_IFCHR | 0600, os.makedev(5, 1), "dev/console"),
>-            (stat.S_IFCHR | 0666, os.makedev(5, 2), "dev/ptmx"),
>-        ]
>-        kver = os.uname()[2]
>-        getLog().debug("kver == %s" % kver)
>-        for i in devFiles:
>-            # create node
>-            os.mknod( self.makeChrootPath(i[2]), i[0], i[1])
>-            # set context. (only necessary if host running selinux enabled.)
>-            # fails gracefully if chcon not installed.
>-            if self.selinux:
>-                mockbuild.util.do(
>-                    ["chcon", "--reference=/%s"% i[2], self.makeChrootPath(i[2])]
>-                    , raiseExc=0, shell=False, env=self.env)
>-
>-        os.symlink("/proc/self/fd/0", self.makeChrootPath("dev/stdin"))
>-        os.symlink("/proc/self/fd/1", self.makeChrootPath("dev/stdout"))
>-        os.symlink("/proc/self/fd/2", self.makeChrootPath("dev/stderr"))
>-
>-        os.chown(self.makeChrootPath('dev/tty'), pwd.getpwnam('root')[2], grp.getgrnam('tty')[2])
>-        os.chown(self.makeChrootPath('dev/ptmx'), pwd.getpwnam('root')[2], grp.getgrnam('tty')[2])
>-
>-        # symlink /dev/fd in the chroot for everything except RHEL4
>-        if mockbuild.util.cmpKernelEVR(kver, '2.6.9') > 0:
>-            os.symlink("/proc/self/fd",   self.makeChrootPath("dev/fd"))
>-
>-        os.umask(prevMask)
>-
>-        if mockbuild.util.cmpKernelEVR(kver, '2.6.29') >= 0:
>-            os.unlink(self.makeChrootPath('/dev/ptmx'))
>-            os.symlink("pts/ptmx", self.makeChrootPath('/dev/ptmx'))
>-        self.finish("device setup")
>+
>+        try:
>+            # files in /dev
>+            mockbuild.util.rmtree(self.makeChrootPath("dev"), selinux=self.selinux)
>+            mockbuild.util.mkdirIfAbsent(self.makeChrootPath("dev", "pts"))
>+            mockbuild.util.mkdirIfAbsent(self.makeChrootPath("dev", "shm"))
>+            prevMask = os.umask(0000)
>+            devFiles = [
>+                (stat.S_IFCHR | 0666, os.makedev(1, 3), "dev/null"),
>+                (stat.S_IFCHR | 0666, os.makedev(1, 7), "dev/full"),
>+                (stat.S_IFCHR | 0666, os.makedev(1, 5), "dev/zero"),
>+                (stat.S_IFCHR | 0666, os.makedev(1, 8), "dev/random"),
>+                (stat.S_IFCHR | 0444, os.makedev(1, 9), "dev/urandom"),
>+                (stat.S_IFCHR | 0666, os.makedev(5, 0), "dev/tty"),
>+                (stat.S_IFCHR | 0600, os.makedev(5, 1), "dev/console"),
>+                (stat.S_IFCHR | 0666, os.makedev(5, 2), "dev/ptmx"),
>+            ]
>+            kver = os.uname()[2]
>+            getLog().debug("kver == %s" % kver)
>+            for i in devFiles:
>+                # create node
>+                os.mknod( self.makeChrootPath(i[2]), i[0], i[1])
>+                # set context. (only necessary if host running selinux enabled.)
>+                # fails gracefully if chcon not installed.
>+                if self.selinux:
>+                    mockbuild.util.do(
>+                        ["chcon", "--reference=/%s"% i[2], self.makeChrootPath(i[2])]
>+                        , raiseExc=0, shell=False, env=self.env)
>+
>+            os.symlink("/proc/self/fd/0", self.makeChrootPath("dev/stdin"))
>+            os.symlink("/proc/self/fd/1", self.makeChrootPath("dev/stdout"))
>+            os.symlink("/proc/self/fd/2", self.makeChrootPath("dev/stderr"))
>+
>+            os.chown(self.makeChrootPath('dev/tty'), pwd.getpwnam('root')[2], grp.getgrnam('tty')[2])
>+            os.chown(self.makeChrootPath('dev/ptmx'), pwd.getpwnam('root')[2], grp.getgrnam('tty')[2])
>+
>+            # symlink /dev/fd in the chroot for everything except RHEL4
>+            if mockbuild.util.cmpKernelEVR(kver, '2.6.9') > 0:
>+                os.symlink("/proc/self/fd",   self.makeChrootPath("dev/fd"))
>+
>+            os.umask(prevMask)
>+
>+            if mockbuild.util.cmpKernelEVR(kver, '2.6.29') >= 0:
>+                os.unlink(self.makeChrootPath('/dev/ptmx'))
>+                os.symlink("pts/ptmx", self.makeChrootPath('/dev/ptmx'))
>+
>+        finally:
>+            self.finish("device setup")
> 
>     decorate(traceLog())
>     def _setupDirs(self):
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 835633: 606100 | 609603 | 609604 | 609624