diff --git a/packages/debootstrap/functions.patch b/packages/debootstrap/functions.patch index 380f96806..afebf85b8 100644 --- a/packages/debootstrap/functions.patch +++ b/packages/debootstrap/functions.patch @@ -1,26 +1,17 @@ -diff -uNr debootstrap-1.0.120/functions debootstrap-1.0.120.mod/functions ---- debootstrap-1.0.120/functions 2020-03-07 19:01:59.000000000 +0200 -+++ debootstrap-1.0.120.mod/functions 2020-03-08 19:42:15.194564546 +0200 -@@ -230,17 +230,7 @@ +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 @@ } 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 || grep -qs systemd-nspawn /proc/1/environ || [ "$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 -@@ -965,7 +955,7 @@ ++ #termux ++ return ++ + if [ "$container" = lxc ]; then + CONTAINER="lxc" + elif grep -qs container=lxc-libvirt /proc/1/environ; then +@@ -974,7 +977,7 @@ extract_dpkg_deb_data () { local pkg="$1" @@ -29,7 +20,7 @@ diff -uNr debootstrap-1.0.120/functions debootstrap-1.0.120.mod/functions } # Raw .deb extractors -@@ -1005,7 +995,7 @@ +@@ -1016,7 +1019,7 @@ esac if in_path "$cat_cmd"; then @@ -38,7 +29,7 @@ diff -uNr debootstrap-1.0.120/functions debootstrap-1.0.120.mod/functions else error 1 UNPACKCMDUNVL "Extracting %s requires the %s command, which is not available" "$pkg" "$cat_cmd" fi -@@ -1061,7 +1051,7 @@ +@@ -1073,7 +1076,7 @@ ); } in_target_nofail () { @@ -47,7 +38,7 @@ diff -uNr debootstrap-1.0.120/functions debootstrap-1.0.120.mod/functions true fi return 0 -@@ -1073,7 +1063,7 @@ +@@ -1085,7 +1088,7 @@ msg="$2" arg="$3" shift; shift; shift @@ -56,7 +47,7 @@ diff -uNr debootstrap-1.0.120/functions debootstrap-1.0.120.mod/functions warning "$code" "$msg" "$arg" # Try to point user at actual failing package. msg="See %s for details" -@@ -1250,7 +1240,6 @@ +@@ -1249,7 +1252,6 @@ return 0 fi