diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2019-03-28 16:54:09 -0400 |
|---|---|---|
| committer | Levente Polyak <anthraxx@archlinux.org> | 2019-08-09 19:41:52 +0200 |
| commit | 74a664194602edf042b38869858e5a601e7f91dd (patch) | |
| tree | ab69a974f5cf045d6b73ae2f7a2ce22ae1b30340 | |
| parent | 69112171e5de910331e46cf3f848866550125024 (diff) | |
| download | devtools-74a664194602edf042b38869858e5a601e7f91dd.tar.xz | |
Escape paths with ":" that are passed to systemd-nspawn --bind
When parsing paths to automatically make available to the container, the
":" is used internally by systemd-nspawn to signify destinations in the
container. Replace automatically with "\:" for the mounts that we set
up, in order to safely handle a working directory etc. that contains
this character.
For bind options exposed to the user, it is assumed the user takes care
of passing systemd-nspawn compatible paths themselves.
Fixes FS#60845
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
| -rw-r--r-- | arch-nspawn.in | 6 | ||||
| -rw-r--r-- | makechrootpkg.in | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in index 5bc8e79..fb2b53e 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -81,14 +81,14 @@ build_mount_args() { for host_mirror in "${host_mirrors[@]}"; do if [[ $host_mirror == *file://* ]]; then host_mirror_path=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g') - mount_args+=("--bind-ro=$host_mirror_path") + mount_args+=("--bind-ro=${host_mirror_path//:/\\:}") fi done - mount_args+=("--bind=${cache_dirs[0]}") + mount_args+=("--bind=${cache_dirs[0]//:/\\:}") for cache_dir in "${cache_dirs[@]:1}"; do - mount_args+=("--bind-ro=$cache_dir") + mount_args+=("--bind-ro=${cache_dir//:/\\:}") done } diff --git a/makechrootpkg.in b/makechrootpkg.in index d9369d4..409f0e7 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -379,8 +379,8 @@ download_sources prepare_chroot if arch-nspawn "$copydir" \ - --bind="$PWD:/startdir" \ - --bind="$SRCDEST:/srcdest" \ + --bind="${PWD//:/\\:}:/startdir" \ + --bind="${SRCDEST//:/\\:}:/srcdest" \ "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \ /chrootbuild "${makepkg_args[@]}" then |