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.
54 lines
1.6 KiB
54 lines
1.6 KiB
8 years ago
|
diff --git a/debootstrap b/debootstrap
|
||
|
|
index 4658e0f..1672990 100755
|
||
|
|
--- a/debootstrap
|
||
|
|
+++ b/debootstrap
|
||
|
|
@@ -14,7 +14,7 @@ if [ -z "$DEBOOTSTRAP_DIR" ]; then
|
||
|
|
if [ -x /debootstrap/debootstrap ]; then
|
||
|
|
DEBOOTSTRAP_DIR=/debootstrap
|
||
|
|
else
|
||
|
|
- DEBOOTSTRAP_DIR=/usr/share/debootstrap
|
||
|
|
+ DEBOOTSTRAP_DIR=$PREFIX/share/debootstrap
|
||
|
|
fi
|
||
|
|
fi
|
||
|
|
|
||
|
|
@@ -421,10 +421,10 @@ fi
|
||
|
|
|
||
|
|
if in_path dpkg && \
|
||
|
|
dpkg --print-architecture >/dev/null 2>&1; then
|
||
|
|
- HOST_ARCH=`/usr/bin/dpkg --print-architecture`
|
||
|
|
+ HOST_ARCH=`$PREFIX/bin/dpkg --print-architecture`
|
||
|
|
elif in_path udpkg && \
|
||
|
|
udpkg --print-architecture >/dev/null 2>&1; then
|
||
|
|
- HOST_ARCH=`/usr/bin/udpkg --print-architecture`
|
||
|
|
+ HOST_ARCH=`$PREFIX/bin/udpkg --print-architecture`
|
||
|
|
elif [ -e $DEBOOTSTRAP_DIR/arch ]; then
|
||
|
|
HOST_ARCH=`cat $DEBOOTSTRAP_DIR/arch`
|
||
|
|
fi
|
||
|
|
@@ -465,7 +465,8 @@ fi
|
||
|
|
if [ "$TARGET" = "/" ]; then
|
||
|
|
CHROOT_CMD=""
|
||
|
|
else
|
||
|
|
- CHROOT_CMD="chroot $TARGET"
|
||
|
|
+ PATH=$PATH:/usr/bin:/bin:/usr/sbin:/sbin
|
||
|
|
+ CHROOT_CMD="proot -w /home -b /dev -b /proc --link2symlink -0 -r $TARGET"
|
||
|
|
fi
|
||
|
|
|
||
|
|
if [ -z "$SHA_SIZE" ]; then
|
||
|
|
@@ -478,16 +479,6 @@ DEBOOTSTRAP_CHECKSUM_FIELD="SHA$SHA_SIZE"
|
||
|
|
|
||
|
|
export ARCH SUITE TARGET CHROOT_CMD SHA_SIZE DEBOOTSTRAP_CHECKSUM_FIELD
|
||
|
|
|
||
|
|
-if am_doing_phase first_stage second_stage; then
|
||
|
|
- if in_path id && [ `id -u` -ne 0 ]; then
|
||
|
|
- error 1 NEEDROOT "debootstrap can only run as root"
|
||
|
|
- fi
|
||
|
|
- # Ensure that we can create working devices and executables on the target.
|
||
|
|
- if ! check_sane_mount "$TARGET"; then
|
||
|
|
- error 1 NOEXEC "Cannot install into target '$TARGET' mounted with noexec or nodev"
|
||
|
|
- fi
|
||
|
|
-fi
|
||
|
|
-
|
||
|
|
if [ ! -e "$SCRIPT" ]; then
|
||
|
|
error 1 NOSCRIPT "No such script: %s" "$SCRIPT"
|
||
|
|
fi
|