2021-11-06 19:57:32 +01:00
|
|
|
diff -uNr debootstrap/functions debootstrap.mod/functions
|
|
|
|
--- debootstrap/functions 2021-08-19 14:49:19.000000000 +0300
|
|
|
|
+++ debootstrap.mod/functions 2021-11-06 20:56:36.542688226 +0200
|
|
|
|
@@ -231,6 +231,9 @@
|
2018-07-10 16:46:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
detect_container () {
|
2021-11-06 19:57:32 +01:00
|
|
|
+ #termux
|
|
|
|
+ return
|
|
|
|
+
|
|
|
|
if [ "$container" = lxc ]; then
|
|
|
|
CONTAINER="lxc"
|
|
|
|
elif grep -qs container=lxc-libvirt /proc/1/environ; then
|
|
|
|
@@ -974,7 +977,7 @@
|
2017-06-06 10:20:41 +02:00
|
|
|
extract_dpkg_deb_data () {
|
|
|
|
local pkg="$1"
|
2017-08-09 23:18:25 +02:00
|
|
|
|
2018-08-27 21:47:42 +02:00
|
|
|
- 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-08-09 23:18:25 +02:00
|
|
|
|
2017-06-06 10:20:41 +02:00
|
|
|
# Raw .deb extractors
|
2021-11-06 19:57:32 +01:00
|
|
|
@@ -1016,7 +1019,7 @@
|
2018-04-30 03:26:35 +02:00
|
|
|
esac
|
2017-08-09 23:18:25 +02:00
|
|
|
|
2018-04-30 03:26:35 +02:00
|
|
|
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
|
2021-11-06 19:57:32 +01:00
|
|
|
@@ -1073,7 +1076,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
|
2021-11-06 19:57:32 +01:00
|
|
|
@@ -1085,7 +1088,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"
|
2021-11-06 19:57:32 +01:00
|
|
|
@@ -1249,7 +1252,6 @@
|
2018-06-21 22:32:14 +02:00
|
|
|
return 0
|
|
|
|
fi
|
|
|
|
|
2017-06-06 10:20:41 +02:00
|
|
|
- setup_devices_simple
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
}
|