mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Linux standalone: Avoid using bundled cp before envionment is fully set up.

Browse source 
On android arm64, I saw the cp fail with "Bad system call", because proot
has not run yet. runshell only recently started using cp, and it's bundled
with git-annex, so this fixes a reversion.

This commit was sponsored by Nick Piper on Patreon.
This commit is contained in:
Joey Hess 2018-10-10 16:02:25 -04:00
parent 142795993a
commit a97ef366fa
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -15,6 +15,8 @@ git-annex (6.20180927) UNRELEASED; urgency=medium
* Fix potential crash in exporttree database due to failure to honor
uniqueness constraint.
* Fix crash when exporttree is set to a bad value.
* Linux standalone: Avoid using bundled cp before envionment is fully set
up.
-- Joey Hess <id@joeyh.name> Thu, 27 Sep 2018 15:27:20 -0400

4
standalone/linux/skel/runshell
View file

@ -147,7 +147,9 @@ if [ -z "${LOCPATH+set}" ]; then
exit 1
fi
echo "$base" > "$LOCPATH/base"
cp "$base/buildid" "$LOCPATH/buildid"
# Not using cp to avoid using the one bundled with git-annex before
# the environment is set up to run it.
cat < "$base/buildid" > "$LOCPATH/buildid"
# Generate locale definition files for the locales in use,
# using the localedef and locale files from the bundle.