Skip to content

RFC: init_buildsystem: Fix create_devs in containers without mknod #1109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vogtinator wants to merge 1 commit into
base: master
Choose a base branch
from
Open

RFC: init_buildsystem: Fix create_devs in containers without mknod #1109

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions init_buildsystem
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,13 @@ umount_stuff() {
buildroot_umount "/proc/sys/fs/binfmt_misc"
buildroot_umount "/proc"
buildroot_umount "/sys"
buildroot_umount "/dev/pts"
buildroot_umount "/dev/shm"
buildroot_umount "/mnt"

for f in "$BUILD_ROOT"/dev/*; do
if mountpoint -q "$f"; then
buildroot_umount "$f"
fi
done
fi
}

Expand Down Expand Up @@ -352,7 +356,12 @@ create_devs() {
if test $com = ln ; then
ln -s $arg $BUILD_ROOT/dev/$file
elif test $com = mknod ; then
mknod -m $mode $BUILD_ROOT/dev/$file $arg
if test -z "$PREPARE_VM" && test -e /run/.containerenv; then
touch $BUILD_ROOT/dev/$file
mount --bind /dev/$file $BUILD_ROOT/dev/$file
else
mknod -m $mode $BUILD_ROOT/dev/$file $arg
fi
fi
done << DEVLIST
mknod null 666 c 1 3
Expand Down