josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

fixup comment indentation

Browse source
This commit is contained in:
Johannes Schauer Marin Rodrigues 2023-09-27 07:52:35 +02:00
parent 6068e7d22e
commit eaa67aea9c
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
mmdebstrap
View file

@ -1266,8 +1266,9 @@ sub setup_mounts {
next; next;
} }
if (!$options->{havemknod}) { if (!$options->{havemknod}) {
# If had mknod, then the directory to bind-mount into # If had mknod, then the directory to bind-mount
# was already created in the run_setup function. # into was already created in the run_setup
# function.
push @cleanup_tasks, sub { push @cleanup_tasks, sub {
rmdir "$options->{root}/dev/$fname" rmdir "$options->{root}/dev/$fname"
or warning("cannot rmdir ./dev/$fname: $!"); or warning("cannot rmdir ./dev/$fname: $!");
@ -1309,17 +1310,17 @@ sub setup_mounts {
or warning("umount ./dev/$fname failed: $?"); or warning("umount ./dev/$fname failed: $?");
}; };
if ($fname eq "pts/") { if ($fname eq "pts/") {
# We cannot just bind-mount /dev/pts from the host as # We cannot just bind-mount /dev/pts from the host
# doing so will make posix_openpt() fail. Instead, we # as doing so will make posix_openpt() fail.
# need to mount a new devpts. # Instead, we need to mount a new devpts.
# We need ptmxmode=666 because /dev/ptmx is a symlink # We need ptmxmode=666 because /dev/ptmx is a
# to /dev/pts/ptmx and without it posix_openpt() will # symlink to /dev/pts/ptmx and without it
# fail if we are not the root user. # posix_openpt() will fail if we are not the root
# See also: # user. See also:
# kernel.org/doc/Documentation/filesystems/devpts.txt # kernel.o/doc/Documentation/filesystems/devpts.txt
# salsa.debian.org/debian/schroot/-/merge_requests/2 # salsa.d.o/debian/schroot/-/merge_requests/2
# https://bugs.debian.org/856877 # https://bugs.debian.org/856877
# https://bugs.debian.org/817236 # https://bugs.debian.org/817236
0 == system( 0 == system(
'mount', 'mount',
'-t', '-t',