termux-packages/packages/debootstrap/functions.patch

67 lines
2.1 KiB
Diff
Raw Normal View History

diff -u -r ../debootstrap-1.0.108/functions ./functions
--- ../debootstrap-1.0.108/functions 2018-08-12 08:58:37.000000000 +0000
+++ ./functions 2018-08-27 19:32:04.844265965 +0000
@@ -230,17 +230,7 @@
2018-07-10 16:46:43 +02:00
}
detect_container () {
- if [ "$container" = lxc ]; then
- CONTAINER="lxc"
- elif grep -qs container=lxc-libvirt /proc/1/environ; then
- CONTAINER="lxc-libvirt"
- elif grep -qs ^systemd-nspawn$ /run/systemd/container || [ "$container" = "systemd-nspawn" ]; then
- CONTAINER="systemd-nspawn"
- elif grep -qs '[[:space:]]/docker/.*/sys/fs/cgroup' /proc/1/mountinfo; then
- CONTAINER="docker"
- else
- CONTAINER=""
- fi
+ CONTAINER=""
}
########################################################## variant handling
@@ -945,7 +935,7 @@
2017-06-06 10:20:41 +02:00
extract_dpkg_deb_data () {
local pkg="$1"
- dpkg-deb --fsys-tarfile "$pkg" | tar $EXTRACT_DEB_TAR_OPTIONS -xf - || error 1 FILEEXIST "Tried to extract package, but file already exists. Exit..."
+ dpkg-deb --fsys-tarfile "$pkg" | proot --link2symlink tar $EXTRACT_DEB_TAR_OPTIONS -xf - || error 1 FILEEXIST "Tried to extract package, but file already exists. Exit..."
2017-06-06 10:20:41 +02:00
}
2017-06-06 10:20:41 +02:00
# Raw .deb extractors
@@ -985,7 +975,7 @@
esac
if in_path "$cat_cmd"; then
- ar -p "$pkg" "$tarball" | "$cat_cmd" | tar $EXTRACT_DEB_TAR_OPTIONS -xf -
+ ar -p "$pkg" "$tarball" | "$cat_cmd" | proot --link2symlink tar $EXTRACT_DEB_TAR_OPTIONS -xf -
2017-06-06 10:20:41 +02:00
else
error 1 UNPACKCMDUNVL "Extracting %s requires the %s command, which is not available" "$pkg" "$cat_cmd"
fi
@@ -1041,7 +1031,7 @@
2018-07-10 16:46:43 +02:00
); }
in_target_nofail () {
- if ! PATH=/sbin:/usr/sbin:/bin:/usr/bin eval "$CHROOT_CMD \"\$@\"" 2>/dev/null; then
+ if ! PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin $CHROOT_CMD "$@" 2>/dev/null; then
true
fi
return 0
@@ -1053,7 +1043,7 @@
2018-07-10 16:46:43 +02:00
msg="$2"
arg="$3"
shift; shift; shift
- if ! PATH=/sbin:/usr/sbin:/bin:/usr/bin eval "$CHROOT_CMD \"\$@\""; then
+ if ! PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin $CHROOT_CMD "$@"; then
warning "$code" "$msg" "$arg"
# Try to point user at actual failing package.
msg="See %s for details"
@@ -1209,7 +1199,6 @@
return 0
fi
2017-06-06 10:20:41 +02:00
- setup_devices_simple
;;
esac
}