parent
90075b79e8
commit
9e57c29d6e
@ -0,0 +1,51 @@
|
||||
From d7311cbd83546a168337df6d267d0f76b1e10fba Mon Sep 17 00:00:00 2001
|
||||
From: Jay Greguske <jgregusk@redhat.com>
|
||||
Date: Thu, 17 Feb 2011 15:13:30 -0500
|
||||
Subject: [PATCH] mount all of /dev
|
||||
|
||||
---
|
||||
builder/kojid | 21 +--------------------
|
||||
1 file changed, 1 insertion(+), 20 deletions(-)
|
||||
|
||||
diff --git a/builder/kojid b/builder/kojid
|
||||
index 92d40f1..a80ca9d 100755
|
||||
--- a/builder/kojid
|
||||
+++ b/builder/kojid
|
||||
@@ -1753,9 +1753,7 @@ class ImageTask(BaseTaskHandler):
|
||||
|
||||
# Here we configure mock to bind mount a set of /dev directories
|
||||
bind_opts = {'dirs' : {
|
||||
- '/dev/pts' : '/dev/pts',
|
||||
- '/dev/shm' : '/dev/shm',
|
||||
- '/dev/mapper' : '/dev/mapper',
|
||||
+ '/dev' : '/dev',
|
||||
'/selinux' : '/selinux'}
|
||||
}
|
||||
rootopts = {'install_group': inst_group,
|
||||
@@ -1769,23 +1767,6 @@ class ImageTask(BaseTaskHandler):
|
||||
# create the mock chroot
|
||||
self.logger.debug("Initializing image buildroot")
|
||||
broot.init()
|
||||
-
|
||||
- # Create the loopback devices we need
|
||||
- cmd = 'for i in $(seq 0 7); do mknod /dev/loop$i b 7 $i; done'
|
||||
- rv = broot.mock(['--chroot', cmd])
|
||||
- if rv:
|
||||
- broot.expire()
|
||||
- raise koji.LiveCDError, \
|
||||
- "Could not create loopback device files: %s" % parseStatus(rv, '"%s"' % cmd)
|
||||
-
|
||||
- # Create /dev/urandom
|
||||
- cmd = 'mknod /dev/urandom c 1 9'
|
||||
- rv = broot.mock(['--chroot', cmd])
|
||||
- if rv:
|
||||
- broot.expire()
|
||||
- raise koji.LiveCDError, \
|
||||
- "Could not create /dev/urandom: %s" % parseStatus(rv, '"%s"' % cmd)
|
||||
-
|
||||
self.logger.debug("Image buildroot ready: " + broot.rootdir())
|
||||
return broot
|
||||
|
||||
--
|
||||
1.7.11.4
|
||||
|
@ -1,26 +0,0 @@
|
||||
From 79352bb36675888d765b2a1eef970ded459bcbc5 Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Fri, 31 Aug 2012 00:13:16 -0500
|
||||
Subject: [PATCH 22/22] only try to make /dev/urandom if it doesnt already
|
||||
exist
|
||||
|
||||
---
|
||||
builder/kojid | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/builder/kojid b/builder/kojid
|
||||
index 92d40f1..58720b4 100755
|
||||
--- a/builder/kojid
|
||||
+++ b/builder/kojid
|
||||
@@ -1779,7 +1779,7 @@ class ImageTask(BaseTaskHandler):
|
||||
"Could not create loopback device files: %s" % parseStatus(rv, '"%s"' % cmd)
|
||||
|
||||
# Create /dev/urandom
|
||||
- cmd = 'mknod /dev/urandom c 1 9'
|
||||
+ cmd = '[ ! -e /dev/urandom ] && (mknod /dev/urandom c 1 9)'
|
||||
rv = broot.mock(['--chroot', cmd])
|
||||
if rv:
|
||||
broot.expire()
|
||||
--
|
||||
1.7.11.4
|
||||
|
Loading…
Reference in new issue