summaryrefslogtreecommitdiffstats
path: root/functions
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-08-15 20:45:26 (GMT)
committerJoey Hess <joey@kitenet.net>2011-08-15 20:53:08 (GMT)
commit3b609a408c6a10890785e9824b0c8f3a78c0089f (patch)
treeefaee5c7f86f7308e2e3ab33e9a0541dcd00a9bc /functions
parent8a38afd4795ce976978e3be0fd539cda1a3da243 (diff)
downloaddebootstrap-3b609a408c6a10890785e9824b0c8f3a78c0089f.zip
debootstrap-3b609a408c6a10890785e9824b0c8f3a78c0089f.tar.gz
debootstrap-3b609a408c6a10890785e9824b0c8f3a78c0089f.tar.bz2
When FreeBSD (not kfreebsd) is the host, don't chroot to mount special filesystems.
That fails for reasons that I don't know, but part of this patch avoids the chroot. http://www.freebsd.org/cgi/cvsweb.cgi/ports/sysutils/debootstrap/files/patch-functions?rev=1.3;content-type=text%2Fplain With this patch, deamonkeeper has confirmed a successful debootstrap from a FreeBSD host.
Diffstat (limited to 'functions')
-rw-r--r--functions10
1 files changed, 8 insertions, 2 deletions
diff --git a/functions b/functions
index e07ca69..aaeb7c5 100644
--- a/functions
+++ b/functions
@@ -968,7 +968,11 @@ setup_proc () {
umount_on_exit /dev
umount_on_exit /proc
umount "$TARGET/proc" 2>/dev/null || true
- in_target mount -t linprocfs proc /proc
+ if [ "$HOST_OS" = kfreebsd ]; then
+ in_target mount -t linprocfs proc /proc
+ else
+ mount -t linprocfs proc $TARGET/proc
+ fi
;;
hurd*)
;;
@@ -1003,8 +1007,10 @@ setup_devices () {
fi
case "$HOST_OS" in
- *freebsd*)
+ kfreebsd*)
in_target mount -t devfs devfs /dev ;;
+ freebsd)
+ mount -t devfs devfs $TARGET/dev ;;
hurd*)
setup_devices_hurd ;;
*)