summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2018-08-26 16:56:33 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2018-08-26 17:58:39 -0400
commit5e84ba0d894fbc1755c2508582f84ec2e08f05e3 (patch)
treec6f27596f19a500b8cedf4a97d19dc6f5b9c2e19 /src
parent320419d272295e0fca26c5ee134609e406e63ddc (diff)
librechroot clean-pkgs: Do the right thing when libretools is installed in the chroot
The /bin/chcleanup file that it installs will clash with the package-owned /usr/bin/chcleanup (since /bin is a symlink)
Diffstat (limited to 'src')
-rwxr-xr-xsrc/chroot-tools/librechroot6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot
index 5d1db21..0b0ce0c 100755
--- a/src/chroot-tools/librechroot
+++ b/src/chroot-tools/librechroot
@@ -484,13 +484,13 @@ main() {
arch-nspawn "$copydir" pacman -Syu --noconfirm </dev/null
;;
clean-pkgs)
- trap "rm -f -- ${copydir@Q}/{bin/chcleanup,chrootexec}" EXIT
- install -m755 "$(librelib chroot/chcleanup)" "$copydir/bin/chcleanup"
+ trap "rm -f -- ${copydir@Q}/{chcleanup,chrootexec}" EXIT
+ install -m755 "$(librelib chroot/chcleanup)" "$copydir/chcleanup"
printf '%s\n' \
'#!/bin/bash' \
'mkdir -p /startdir' \
'cd /startdir' \
- '/bin/chcleanup' \
+ '/chcleanup' \
> "$copydir/chrootexec"
chmod 755 "$copydir/chrootexec"
arch-nspawn "$copydir" /chrootexec </dev/null