You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
66 lines
2.0 KiB
66 lines
2.0 KiB
diff -uNr debootstrap-1.0.106/functions debootstrap-1.0.106.mod/functions
|
|
--- debootstrap-1.0.106/functions 2018-07-05 11:48:22.000000000 +0300
|
|
+++ debootstrap-1.0.106.mod/functions 2018-07-10 17:20:18.985640585 +0300
|
|
@@ -220,17 +220,7 @@
|
|
}
|
|
|
|
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
|
|
@@ -924,7 +914,7 @@
|
|
extract_dpkg_deb_data () {
|
|
local pkg="$1"
|
|
|
|
- dpkg-deb --fsys-tarfile "$pkg" | tar $EXTRACT_DEB_TAR_OPTIONS -xf -
|
|
+ dpkg-deb --fsys-tarfile "$pkg" | proot --link2symlink tar $EXTRACT_DEB_TAR_OPTIONS -xf -
|
|
}
|
|
|
|
# Raw .deb extractors
|
|
@@ -964,7 +954,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 -
|
|
else
|
|
error 1 UNPACKCMDUNVL "Extracting %s requires the %s command, which is not available" "$pkg" "$cat_cmd"
|
|
fi
|
|
@@ -1020,7 +1010,7 @@
|
|
); }
|
|
|
|
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
|
|
@@ -1032,7 +1022,7 @@
|
|
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"
|
|
@@ -1184,7 +1174,6 @@
|
|
return 0
|
|
fi
|
|
|
|
- setup_devices_simple
|
|
;;
|
|
esac
|
|
}
|
|
|