diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-26 16:03:02 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-26 16:03:02 +0000 |
| commit | 6584112d593ed9fe0bcb2680d82a8849e708dccc (patch) | |
| tree | b2c3860f98b73c1cc5857b4c4a8df54e4c35e761 /tests/pivot_root | |
| parent | Releasing progress-linux version 1.5.1-4~progress7.99u1. (diff) | |
| download | mmdebstrap-6584112d593ed9fe0bcb2680d82a8849e708dccc.tar.xz mmdebstrap-6584112d593ed9fe0bcb2680d82a8849e708dccc.zip | |
Merging upstream version 1.5.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/pivot_root')
| -rw-r--r-- | tests/pivot_root | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/pivot_root b/tests/pivot_root index 860c41b..7aa025e 100644 --- a/tests/pivot_root +++ b/tests/pivot_root @@ -17,19 +17,19 @@ if [ "$(id -u)" -eq 0 ] && [ "{{ MODE }}" != "root" ] && [ "{{ MODE }}" != "auto fi $prefix {{ CMD }} --mode={{ MODE }} --variant=apt \ - --include=mount \ + --include=mount,perl \ {{ DIST }} /tmp/chroot1.tar {{ MIRROR }} if [ {{ MODE }} = "unshare" ]; then # calling pivot_root in root mode does not work for mysterious reasons: # pivot_root: failed to change root from `.' to `mnt': Invalid argument - $prefix {{ CMD }} --mode={{ MODE }} --variant=apt --include=mount \ + $prefix {{ CMD }} --mode={{ MODE }} --variant=apt --include=mount,perl \ --customize-hook='mkdir -p "$1/mnt" "$1/oldroot"' \ --customize-hook='[ ! -e /usr/bin/mmdebstrap ] || cp -aT /usr/bin/mmdebstrap "$1/usr/bin/mmdebstrap"' \ --customize-hook='[ ! -e ./mmdebstrap ] || cp -aT ./mmdebstrap "$1/mnt/mmdebstrap"' \ --customize-hook='mount -o rbind "$1" /mnt && cd /mnt && /sbin/pivot_root . oldroot' \ --customize-hook='unshare -U echo nested unprivileged unshare' \ - --customize-hook='env --chdir=/mnt {{ CMD }} --mode=unshare --variant=apt --include=mount {{ DIST }} /tmp/chroot3.tar {{ MIRROR }}' \ + --customize-hook='env --chdir=/mnt {{ CMD }} --mode=unshare --variant=apt --include=mount,perl {{ DIST }} /tmp/chroot3.tar {{ MIRROR }}' \ --customize-hook='copy-out /tmp/chroot3.tar /tmp' \ --customize-hook='rm -f "/usr/bin/mmdebstrap" "/mnt/mmdebstrap"' \ --customize-hook='umount -l oldroot sys' \ @@ -41,11 +41,11 @@ if [ {{ MODE }} = "unshare" ]; then rm /tmp/chroot2.tar /tmp/chroot3.tar fi -$prefix {{ CMD }} --mode={{ MODE }} --variant=apt --include=mount \ +$prefix {{ CMD }} --mode={{ MODE }} --variant=apt --include=mount,perl \ --customize-hook='mkdir -p "$1/mnt"' \ --customize-hook='[ ! -e /usr/bin/mmdebstrap ] || cp -aT /usr/bin/mmdebstrap "$1/usr/bin/mmdebstrap"' \ --customize-hook='[ ! -e ./mmdebstrap ] || cp -aT ./mmdebstrap "$1/mnt/mmdebstrap"' \ - --chrooted-customize-hook='env --chdir=/mnt {{ CMD }} --mode=unshare --variant=apt --include=mount {{ DIST }} /tmp/chroot3.tar {{ MIRROR }}' \ + --chrooted-customize-hook='env --chdir=/mnt {{ CMD }} --mode=unshare --variant=apt --include=mount,perl {{ DIST }} /tmp/chroot3.tar {{ MIRROR }}' \ --customize-hook='copy-out /tmp/chroot3.tar /tmp' \ --customize-hook='rm -f "$1/usr/bin/mmdebstrap" "$1/mnt/mmdebstrap"' \ {{ DIST }} /tmp/chroot2.tar {{ MIRROR }} |