Package: debootstrap
Version: 0.3.1.4
Severity: normal
Tags: patch

Hi!

This patch fixes debootstrap to work on GNU/kFreeBSD (kfreebsd-i386).

diff -ur debootstrap-0.3.1.4.old/functions debootstrap-0.3.1.4/functions
--- debootstrap-0.3.1.4.old/functions   2005-06-27 05:35:13.000000000 +0200
+++ debootstrap-0.3.1.4/functions       2005-07-25 01:17:30.000000000 +0200
@@ -731,13 +731,24 @@
   fi
 }
 
+uname="`uname -s`"
+
 setup_proc () {
-  on_exit "umount $TARGET/dev/pts"
-  on_exit "umount $TARGET/dev/shm"
-  on_exit "umount $TARGET/proc/bus/usb"
+  case "$uname" in
+    Linux)
+      on_exit "umount $TARGET/dev/pts"
+      on_exit "umount $TARGET/dev/shm"
+      on_exit "umount $TARGET/proc/bus/usb"
+      procfs="proc"
+    ;;
+    GNU/kFreeBSD)
+      on_exit "umount $TARGET/dev"
+      procfs="linprocfs"
+    ;;
+  esac
   on_exit "umount $TARGET/proc"
   umount $TARGET/proc 2>/dev/null || true
-  in_target mount -t proc proc /proc
+  in_target mount -t ${procfs} proc /proc
 }
 
 setup_proc_fakechroot () {
@@ -749,7 +760,7 @@
   if [ -e $DEVICES_TARGZ ]; then
     (cd "$TARGET"; zcat $DEVICES_TARGZ | tar -xf -)
   else
-    if [ -e /dev/.devfsd ]; then
+    if [ -e /dev/.devfsd ] || [ "$uname" = "GNU/kFreeBSD" ] ; then
       in_target mount -t devfs devfs /dev
     else
       error 1 NODEVTGZ "no %s. cannot create devices" "$DEVICES_TARGZ"


-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.11-1-k7
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ANSI_X3.4-1968) (ignored: LC_ALL 
set to C)

Versions of packages debootstrap depends on:
ii  binutils              2.16.1-2           The GNU assembler, linker and bina
ii  wget                  1.10-3+1.10.1beta1 retrieves files from the web

debootstrap recommends no packages.

-- no debconf information


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to