Merge pull request #311 from doraskayo/missing-dev-nodes

Mount a few missing device nodes in chroot bootstrap modes
This commit is contained in:
Andrius Štikonas 2023-07-16 20:55:40 +01:00 committed by GitHub
commit 8d96234d22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 10 deletions

View File

@ -197,6 +197,8 @@ print(shutil.which('chroot'))
'--dev-bind', '/dev/zero', '/dev/zero',
'--dev-bind', '/dev/random', '/dev/random',
'--dev-bind', '/dev/urandom', '/dev/urandom',
'--dev-bind', '/dev/ptmx', '/dev/ptmx',
'--dev-bind', '/dev/tty', '/dev/tty',
init)
if not args.internal_ci or args.internal_ci == "pass2" or args.internal_ci == "pass3":
@ -214,6 +216,8 @@ print(shutil.which('chroot'))
'--dev-bind', '/dev/zero', '/dev/zero',
'--dev-bind', '/dev/random', '/dev/random',
'--dev-bind', '/dev/urandom', '/dev/urandom',
'--dev-bind', '/dev/ptmx', '/dev/ptmx',
'--dev-bind', '/dev/tty', '/dev/tty',
'--tmpfs', '/dev/shm',
'--proc', '/proc',
'--bind', '/sys', '/sys',

View File

@ -95,15 +95,15 @@ b86fc586d72a6d204d0b9017afe17aa2439529e13f43befc56648b78de17c8f8 perl5.004-05_0
1b9d4260edf7b2241d10e4c4ad17d0f90047bd4bf42f2487a7133902529e9dfe pkg-config-0.29.2_0.tar.bz2
5c4d4ff26c44b92caf08350f0e24f97b343961c4fd73f511f6bcef6a5e645b3f python-2.0.1_0.tar.bz2
f0c7bb60faae8eaf6960dfaad43acc7e30d5487ae114e44ec3c184c946adbc6f python-2.0.1_1.tar.bz2
7f6a19ae15a1defc56892e525a1189eaaebfaf54dd3650e6e2ce096671abb242 python-2.3.7_0.tar.bz2
1a34670eed0560c5310d33efd9f59d364823c05e9c1fc14e00bebc2357bf391b python-2.3.7_1.tar.bz2
a7c1dda2258c4c134359672f2212d9b57e637828e9e88a0329ad7a201862701f python-2.5.6_0.tar.bz2
bd695098de90d11057dc72a54bab0fc1c90ff58acd757dfe74cc68f7c7473fd4 python-3.1.5_0.tar.bz2
78126ae8a76c7b1802ad3d02cae9a0d4314f2058f5cc794d16f8f504913f7f8d python-3.1.5_1.tar.bz2
0eaf6ac5b165b4077e1d8d11117204381972f751bedc058bff831f6b84f55149 python-3.11.1_0.tar.bz2
e3ab9ab2b5918ac3c9eac4e6e3c73062a6808a6219ff1a8541df0ff8f839d708 python-3.3.7_0.tar.bz2
221242c8ece78827c412ee606e6692516cf512c56c3448900f7454ea3b6710a5 python-3.4.10_0.tar.bz2
09e2b7ba2ac081a04b821f521e15a50442e4f3adbf4850871a3d0113525144f8 python-3.8.16_0.tar.bz2
5163e798e204b0e4ea1ab5d513ad618e11fb6dd01414991f7c7408dc74d54400 python-2.3.7_0.tar.bz2
ce21de104f50a65012f42df46b53beaf1dc2d8c5bf8f09ad20f80f64a2eb4d68 python-2.3.7_1.tar.bz2
0ced0d04ab4774dcf99eebfe3271a1b368c9a35f4f1467bf43fd000fbb32be16 python-2.5.6_0.tar.bz2
eba41b855f378e004648b1b3453485d2d4401cd72cf7b993c1be06b7cebf71a2 python-3.1.5_0.tar.bz2
e10a0eceb1fcb9ca80dfcaf53bfa0d311adbaccdaf6846a6c5abfbea1e7db879 python-3.1.5_1.tar.bz2
bc87d4b8b0d2f26ed7d632c73ef9cd937bc9b6cb3bdcb57fdea78d29e38722bc python-3.11.1_0.tar.bz2
be89de80f75679c07e59f72b8d3ee4f14edcaa306dccd9d8a2c8adbb83245a43 python-3.3.7_0.tar.bz2
e4a6dd6ff78b4f46e17e2b867e1562e1fa3a6c75db890c136818382d31619b78 python-3.4.10_0.tar.bz2
1e0c73270bec02c323981d75ce4c731677672719ea34abf06ba145b56aae178e python-3.8.16_0.tar.bz2
6081832f1fc258df7dd927986821991b49fa78a71b76f4b37b5c34a8ebc9bc86 sed-4.0.9_0.tar.bz2
e58d8ec46c5b31175de9598bf0da214b88ccbd4cca7a787f3d048c44edaf3ceb sed-4.8_0.tar.bz2
912d8f344104f1322255d6210c7c7e1371413ab530b2c6796e6aa565c74bf647 tar-1.34_0.tar.bz2

View File

@ -472,12 +472,14 @@ populate_device_nodes() {
test -c "/dev/random" || mknod -m 444 "/dev/random" c 1 8
test -c "/dev/urandom" || mknod -m 444 "/dev/urandom" c 1 9
test -c "/dev/ptmx" || mknod -m 666 "/dev/ptmx" c 5 2
test -c "/dev/tty" || mknod -m 666 "/dev/tty" c 5 0
if command -v mount >/dev/null 2>&1; then
test -d "/dev/shm" || (mkdir /dev/shm && mount -t tmpfs tmpfs /dev/shm)
fi
if [ "${CHROOT}" = False ]; then
test -c "/dev/tty" || mknod -m 666 "/dev/tty" c 5 0
test -c "/dev/console" || mknod -m 666 "/dev/console" c 5 1
fi
}