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

now that fakechroot and proot are fixed, add support for for variants beyond essential and apt

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2019-01-01 14:28:56 +01:00
parent e5564a0dad
commit 1e0b4cb3b0
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
2 changed files with 164 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
coverage.sh
View file

@ -496,14 +496,18 @@ END
if [ "$variant" = standard ]; then if [ "$variant" = standard ]; then
continue continue
fi fi
# FIXME: cannot test fakechroot or proot in any other variant
# than essential because of
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=909637
case "$mode" in case "$mode" in
fakechroot|proot) proot)
if [ "$variant" != "essential" ]; then case "$variant" in
continue important|debootstrap|-|standard)
fi # the systemd postint yields:
# chfn: PAM: System error
# adduser: `/usr/bin/chfn -f systemd Time Synchronization systemd-timesync' returned error code 1. Exiting.
# similar error with fakechroot https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=745082#75
# https://github.com/proot-me/PRoot/issues/156
continue
;;
esac
;; ;;
esac esac
print_header "mode=$mode,variant=$variant: create tarball" print_header "mode=$mode,variant=$variant: create tarball"
@ -714,28 +718,9 @@ fi
# test foreign architecture with all modes # test foreign architecture with all modes
# create directory in sudo mode # create directory in sudo mode
# FIXME: once fakechroot and proot are fixed, we have to test more variants
# than just essential
print_header "mode=root,variant=essential: create directory"
cat << END > shared/test.sh
#!/bin/sh
set -eu
export LC_ALL=C.UTF-8
$CMD --mode=root --variant=essential unstable /tmp/unstable-chroot.tar $mirror
tar -tf /tmp/unstable-chroot.tar | sort > tar1.txt
rm /tmp/unstable-chroot.tar
END
if [ "$HAVE_QEMU" = "yes" ]; then
./run_qemu.sh
else
./run_null.sh SUDO
fi
# FIXME: once fakechroot and proot are fixed, we can switch to variant=apt
# FIXME: cannot test fakechroot or proot because of
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=909637
for mode in root unshare fakechroot proot; do for mode in root unshare fakechroot proot; do
print_header "mode=$mode,variant=essential: create armhf tarball" print_header "mode=$mode,variant=apt: create armhf tarball"
if [ "$HAVE_BINFMT" != "yes" ]; then if [ "$HAVE_BINFMT" != "yes" ]; then
echo "HAVE_BINFMT != yes -- Skipping test..." echo "HAVE_BINFMT != yes -- Skipping test..."
continue continue
@ -757,7 +742,7 @@ export LC_ALL=C.UTF-8
prefix= prefix=
[ "\$(id -u)" -eq 0 ] && [ "$mode" != "root" ] && prefix="runuser -u user --" [ "\$(id -u)" -eq 0 ] && [ "$mode" != "root" ] && prefix="runuser -u user --"
[ "$mode" = "fakechroot" ] && prefix="\$prefix fakechroot fakeroot" [ "$mode" = "fakechroot" ] && prefix="\$prefix fakechroot fakeroot"
\$prefix $CMD --mode=$mode --variant=essential --architectures=armhf unstable /tmp/unstable-chroot.tar $mirror \$prefix $CMD --mode=$mode --variant=apt --architectures=armhf unstable /tmp/unstable-chroot.tar $mirror
# we ignore differences between architectures by ignoring some files # we ignore differences between architectures by ignoring some files
# and renaming others # and renaming others
# in fakechroot mode, we use a fake ldconfig, so we have to # in fakechroot mode, we use a fake ldconfig, so we have to

222
mmdebstrap
View file

@ -1025,22 +1025,75 @@ sub setup {
# nothing to do # nothing to do
} elsif (any { $_ eq $options->{variant} } ('custom', 'essential', 'apt', 'standard', 'important', 'required', 'buildd', 'minbase')) { } elsif (any { $_ eq $options->{variant} } ('custom', 'essential', 'apt', 'standard', 'important', 'required', 'buildd', 'minbase')) {
if ($options->{mode} eq 'fakechroot') { if ($options->{mode} eq 'fakechroot') {
# FIXME: if trouble arises, look into /etc/fakechroot/*.env for # this borrows from and extends
# more interesting variables to set # /etc/fakechroot/debootstrap.env and /etc/fakechroot/chroot.env
$ENV{FAKECHROOT_CMD_SUBST} = join ':', ( {
'/bin/mount=/bin/true', my @fakechrootsubst = ();
'/usr/bin/ldd=/usr/bin/ldd.fakechroot', foreach my $dir ('/usr/sbin', '/usr/bin', '/sbin', '/bin') {
'/usr/bin/mkfifo=/bin/true', push @fakechrootsubst, "$dir/chroot=/usr/sbin/chroot.fakechroot";
'/sbin/ldconfig=/bin/true', push @fakechrootsubst, "$dir/mkfifo=/bin/true";
); push @fakechrootsubst, "$dir/ldconfig=/bin/true";
push @fakechrootsubst, "$dir/ldd=/usr/bin/ldd.fakechroot";
push @fakechrootsubst, "$dir/ischroot=/bin/true";
}
if (defined $ENV{FAKECHROOT_CMD_SUBST}
&& $ENV{FAKECHROOT_CMD_SUBST} ne "") {
push @fakechrootsubst, split /:/, $ENV{FAKECHROOT_CMD_SUBST};
}
$ENV{FAKECHROOT_CMD_SUBST} = join ':', @fakechrootsubst;
}
if (defined $ENV{FAKECHROOT_EXCLUDE_PATH}
&& $ENV{FAKECHROOT_EXCLUDE_PATH} ne "") {
$ENV{FAKECHROOT_EXCLUDE_PATH} = "$ENV{FAKECHROOT_EXCLUDE_PATH}:/dev:/proc:/sys";
} else {
$ENV{FAKECHROOT_EXCLUDE_PATH} = '/dev:/proc:/sys';
}
# workaround for long unix socket path if FAKECHROOT_BASE
# exceeds the limit of 108 bytes
$ENV{FAKECHROOT_AF_UNIX_PATH} = "/tmp";
{
my @ldsoconf = ('/etc/ld.so.conf');
opendir(my $dh, '/etc/ld.so.conf.d') or die "Can't opendir(/etc/ld.so.conf.d): $!";
while (my $entry = readdir $dh) {
# skip the "." and ".." entries
next if $entry eq ".";
next if $entry eq "..";
next if $entry !~ /\.conf$/;
push @ldsoconf, "/etc/ld.so.conf.d/$entry";
}
closedir($dh);
my @ldlibpath = ();
if (defined $ENV{LD_LIBRARY_PATH}
&& $ENV{LD_LIBRARY_PATH} ne "") {
push @ldlibpath, (split /:/, $ENV{LD_LIBRARY_PATH});
}
# FIXME: workaround allowing installation of systemd should
# live in fakechroot, see #917920
push @ldlibpath, "/lib/systemd";
foreach my $fname (@ldsoconf) {
open my $fh, "<", $fname or die "cannot open $fname for reading: $!";
while (my $line = <$fh>) {
next if $line !~ /^\//;
push @ldlibpath, $line;
}
close $fh;
}
$ENV{LD_LIBRARY_PATH} = join ':', @ldlibpath;
}
} }
# make sure that APT_CONFIG is not set when executing anything inside the # make sure that APT_CONFIG is not set when executing anything inside the
# chroot # chroot
my @chrootcmd = ('env', '--unset=APT_CONFIG'); my @chrootcmd = ('env', '--unset=APT_CONFIG');
if ($options->{mode} eq 'proot') { if ($options->{mode} eq 'proot') {
# FIXME: proot currently cannot install apt because of https://github.com/proot-me/PRoot/issues/147 push @chrootcmd, (
push @chrootcmd, ('proot', '--root-id', '--bind=/dev', "--rootfs=$options->{root}", '--cwd=/'); 'proot',
'--root-id',
'--bind=/dev',
'--bind=/proc',
'--bind=/sys',
"--rootfs=$options->{root}",
'--cwd=/');
} elsif (any { $_ eq $options->{mode} } ('root', 'unshare', 'fakechroot')) { } elsif (any { $_ eq $options->{mode} } ('root', 'unshare', 'fakechroot')) {
push @chrootcmd, ('/usr/sbin/chroot', $options->{root}); push @chrootcmd, ('/usr/sbin/chroot', $options->{root});
} else { } else {
@ -1223,38 +1276,45 @@ sub setup {
} }
} }
# if more than essential should be installed, make the system look if (any { $_ eq $options->{mode} } ('root', 'unshare')) {
# more like a real one by creating or bind-mounting the device nodes # if more than essential should be installed, make the system look
foreach my $file (@devfiles) { # more like a real one by creating or bind-mounting the device nodes
my ($fname, $mode, $type, $linkname, $devmajor, $devminor) = @{$file}; foreach my $file (@devfiles) {
next if $fname eq './dev/'; my ($fname, $mode, $type, $linkname, $devmajor, $devminor) = @{$file};
if ($type == 0) { # normal file next if $fname eq './dev/';
die "type 0 not implemented"; if ($type == 0) { # normal file
} elsif ($type == 1) { # hardlink die "type 0 not implemented";
die "type 1 not implemented"; } elsif ($type == 1) { # hardlink
} elsif ($type == 2) { # symlink die "type 1 not implemented";
if (!$options->{havemknod}) { } elsif ($type == 2) { # symlink
if ($options->{mode} eq 'fakechroot' and $linkname =~ /^\/proc/) { if (!$options->{havemknod}) {
# there is no /proc in fakechroot mode if ($options->{mode} eq 'fakechroot' and $linkname =~ /^\/proc/) {
next; # there is no /proc in fakechroot mode
next;
}
symlink $linkname, "$options->{root}/$fname" or die "cannot create symlink $fname";
}
} elsif ($type == 3 or $type == 4) { # character/block special
if (!$options->{havemknod}) {
open my $fh, '>', "$options->{root}/$fname" or die "cannot open $options->{root}/$fname: $!";
close $fh;
0 == system('mount', '-o', 'bind', "/$fname", "$options->{root}/$fname") or die "mount failed: $?";
}
} elsif ($type == 5) { # directory
if (!$options->{havemknod}) {
make_path "$options->{root}/$fname";
chmod $mode, "$options->{root}/$fname" or die "cannot chmod $fname: $!";
} }
symlink $linkname, "$options->{root}/$fname" or die "cannot create symlink $fname";
}
} elsif ($type == 3 or $type == 4) { # character/block special
if (!$options->{havemknod}) {
open my $fh, '>', "$options->{root}/$fname" or die "cannot open $options->{root}/$fname: $!";
close $fh;
0 == system('mount', '-o', 'bind', "/$fname", "$options->{root}/$fname") or die "mount failed: $?"; 0 == system('mount', '-o', 'bind', "/$fname", "$options->{root}/$fname") or die "mount failed: $?";
} else {
die "unsupported type: $type";
} }
} elsif ($type == 5) { # directory
if (!$options->{havemknod}) {
make_path "$options->{root}/$fname";
chmod $mode, "$options->{root}/$fname" or die "cannot chmod $fname: $!";
}
0 == system('mount', '-o', 'bind', "/$fname", "$options->{root}/$fname") or die "mount failed: $?";
} else {
die "unsupported type: $type";
} }
} elsif (any { $_ eq $options->{mode} } ('proot', 'fakechroot')) {
# we cannot mount in fakechroot and proot mode
# in proot mode we have /dev bind-mounted already through --bind=/dev
} else {
die "unknown mode: $options->{mode}";
} }
# We can only mount /proc and /sys after extracting the essential # We can only mount /proc and /sys after extracting the essential
# set because if we mount it before, then base-files will not be able # set because if we mount it before, then base-files will not be able
@ -1266,12 +1326,22 @@ sub setup {
# we have to rbind because just using bind results in "wrong fs # we have to rbind because just using bind results in "wrong fs
# type, bad option, bad superblock" error # type, bad option, bad superblock" error
0 == system('mount', '-o', 'rbind', '/sys', "$options->{root}/sys") or die "mount failed: $?"; 0 == system('mount', '-o', 'rbind', '/sys', "$options->{root}/sys") or die "mount failed: $?";
} elsif (any { $_ eq $options->{mode} } ('root', 'fakechroot', 'proot')) { } elsif ($options->{mode} eq 'root') {
0 == system('mount', '-t', 'sysfs', '-o', 'nosuid,nodev,noexec', 'sys', "$options->{root}/sys") or die "mount failed: $?"; 0 == system('mount', '-t', 'sysfs', '-o', 'nosuid,nodev,noexec', 'sys', "$options->{root}/sys") or die "mount failed: $?";
} elsif (any { $_ eq $options->{mode} } ('proot', 'fakechroot')) {
# we cannot mount in fakechroot and proot mode
# in proot mode we have /proc bind-mounted already through --bind=/proc
} else {
die "unknown mode: $options->{mode}";
}
if (any { $_ eq $options->{mode} } ('root', 'unshare')) {
0 == system('mount', '-t', 'proc', 'proc', "$options->{root}/proc") or die "mount failed: $?";
} elsif (any { $_ eq $options->{mode} } ('proot', 'fakechroot')) {
# we cannot mount in fakechroot and proot mode
# in proot mode we have /sys bind-mounted already through --bind=/sys
} else { } else {
die "unknown mode: $options->{mode}"; die "unknown mode: $options->{mode}";
} }
0 == system('mount', '-t', 'proc', 'proc', "$options->{root}/proc") or die "mount failed: $?";
# prevent daemons from starting # prevent daemons from starting
{ {
@ -1302,46 +1372,54 @@ sub setup {
move("$options->{root}/sbin/start-stop-daemon.REAL", "$options->{root}/sbin/start-stop-daemon") or die "cannot move start-stop-daemon"; move("$options->{root}/sbin/start-stop-daemon.REAL", "$options->{root}/sbin/start-stop-daemon") or die "cannot move start-stop-daemon";
unlink "$options->{root}/usr/sbin/policy-rc.d" or die "cannot unlink policy-rc.d"; unlink "$options->{root}/usr/sbin/policy-rc.d" or die "cannot unlink policy-rc.d";
foreach my $file (@devfiles) { if (any { $_ eq $options->{mode} } ('root', 'unshare')) {
my ($fname, undef, $type, $linkname, undef, undef) = @{$file}; foreach my $file (@devfiles) {
next if $fname eq './dev/'; my ($fname, undef, $type, $linkname, undef, undef) = @{$file};
if ($type == 0) { # normal file next if $fname eq './dev/';
die "type 0 not implemented"; if ($type == 0) { # normal file
} elsif ($type == 1) { # hardlink die "type 0 not implemented";
die "type 1 not implemented"; } elsif ($type == 1) { # hardlink
} elsif ($type == 2) { # symlink die "type 1 not implemented";
if (!$options->{havemknod}) { } elsif ($type == 2) { # symlink
if ($options->{mode} eq 'fakechroot' and $linkname =~ /^\/proc/) { if (!$options->{havemknod}) {
# there is no /proc in fakechroot mode unlink "$options->{root}/$fname" or die "cannot unlink $fname: $!";
next;
} }
unlink "$options->{root}/$fname" or die "cannot unlink $fname: $!"; } elsif ($type == 3 or $type == 4) { # character/block special
} if (!$options->{havemknod}) {
} elsif ($type == 3 or $type == 4) { # character/block special if ($options->{mode} eq 'unshare') {
if (!$options->{havemknod}) { # FIXME: handle umount by a signal handler in
# case of CTRL+C
0 == system('umount', '--no-mtab', "$options->{root}/$fname") or die "umount failed: $?";
} elsif ($options->{mode} eq 'root') {
0 == system('umount', "$options->{root}/$fname") or die "umount failed: $?";
} elsif (any { $_ eq $options->{mode} } ('fakechroot', 'proot')) {
die "impossible";
} else {
die "unknown mode: $options->{mode}";
}
unlink "$options->{root}/$fname";
}
} elsif ($type == 5) { # directory
if ($options->{mode} eq 'unshare') { if ($options->{mode} eq 'unshare') {
0 == system('umount', '--no-mtab', "$options->{root}/$fname") or die "umount failed: $?"; 0 == system('umount', '--no-mtab', "$options->{root}/$fname") or die "umount failed: $?";
} elsif (any { $_ eq $options->{mode} } ('root', 'fakechroot', 'proot')) { } elsif ($options->{mode} eq 'root') {
0 == system('umount', "$options->{root}/$fname") or die "umount failed: $?"; 0 == system('umount', "$options->{root}/$fname") or die "umount failed: $?";
} elsif (any { $_ eq $options->{mode} } ('fakechroot', 'proot')) {
die "impossible";
} else { } else {
die "unknown mode: $options->{mode}"; die "unknown mode: $options->{mode}";
} }
unlink "$options->{root}/$fname"; if (!$options->{havemknod}) {
} rmdir "$options->{root}/$fname" or die "cannot rmdir $fname: $!";
} elsif ($type == 5) { # directory }
if ($options->{mode} eq 'unshare') {
0 == system('umount', '--no-mtab', "$options->{root}/$fname") or die "umount failed: $?";
} elsif (any { $_ eq $options->{mode} } ('root', 'fakechroot', 'proot')) {
0 == system('umount', "$options->{root}/$fname") or die "umount failed: $?";
} else { } else {
die "unknown mode: $options->{mode}"; die "unsupported type: $type";
} }
if (!$options->{havemknod}) {
rmdir "$options->{root}/$fname" or die "cannot rmdir $fname: $!";
}
} else {
die "unsupported type: $type";
} }
} elsif (any { $_ eq $options->{mode} } ('proot', 'fakechroot')) {
# nothing was mounted
} else {
die "unknown mode: $options->{mode}";
} }
# naturally we have to clean up after ourselves in sudo mode where we # naturally we have to clean up after ourselves in sudo mode where we
# do a real mount. But we also need to unmount in unshare mode because # do a real mount. But we also need to unmount in unshare mode because
@ -1353,9 +1431,11 @@ sub setup {
# unmounting /sys only seems to be successful with --lazy # unmounting /sys only seems to be successful with --lazy
0 == system('umount', '--no-mtab', '--lazy', "$options->{root}/sys") or die "umount failed: $?"; 0 == system('umount', '--no-mtab', '--lazy', "$options->{root}/sys") or die "umount failed: $?";
0 == system('umount', '--no-mtab', "$options->{root}/proc") or die "umount failed: $?"; 0 == system('umount', '--no-mtab', "$options->{root}/proc") or die "umount failed: $?";
} elsif (any { $_ eq $options->{mode} } ('root', 'fakechroot', 'proot')) { } elsif ($options->{mode} eq 'root') {
0 == system('umount', "$options->{root}/sys") or die "umount failed: $?"; 0 == system('umount', "$options->{root}/sys") or die "umount failed: $?";
0 == system('umount', "$options->{root}/proc") or die "umount failed: $?"; 0 == system('umount', "$options->{root}/proc") or die "umount failed: $?";
} elsif (any { $_ eq $options->{mode} } ('proot', 'fakechroot')) {
# nothing was mounted
} else { } else {
die "unknown mode: $options->{mode}"; die "unknown mode: $options->{mode}";
} }