[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#314311: marked as done (debootstrap: Patch for proc and device handling on GNU/Hurd)

Your message dated Tue, 07 Aug 2007 23:32:02 +0000
with message-id <E1IIYWw-0005S6-6d@ries.debian.org>
and subject line Bug#314311: fixed in debootstrap 1.0.2
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message --- 
package: debootstrap
severity: normal
tags: patch

Hi,

the attached patch does the following:

1. in setup_devices, if /bin/settrans exists, it calls
setup_hurd_devices rather than extracting devices.tar.gz.  Note that
this means cross-debootstrapping the Hurd from Linux will fail for now
as in that case devices.tar.gz will get extracted and no translators are
setup upon reboot.

2. adds setup_hurd_devices (ported from Marcus Brinkmann's
native-install script), which sets up $TARGET/dev and $TARGET/servers
appropriate for hurd-i386.

3. makes setup_proc a no-op if /proc does not exist (as setup_proc is
run in second stage I guess that's alright).  Maybe that should be
changed to check for $ARCH = "hurd-i386" directly?  Alternatively, the
sid script could be changed to just skip setup_proc on hurd-i386.


cheers,

Michael

--- debootstrap-0.3.1/functions	2005-06-13 16:29:56.000000000 +0200
+++ debootstrap-0.3.1/functions.new	2005-06-15 20:50:26.000000000 +0200
@@ -732,26 +732,48 @@
 }
 
 setup_proc () {
-  on_exit "umount $TARGET/dev/pts"
-  on_exit "umount $TARGET/dev/shm"
-  on_exit "umount $TARGET/proc/bus/usb"
-  on_exit "umount $TARGET/proc"
-  umount $TARGET/proc 2>/dev/null || true
-  in_target mount -t proc proc /proc
+  if [ -e /proc ]; then
+    on_exit "umount $TARGET/dev/pts"
+    on_exit "umount $TARGET/dev/shm"
+    on_exit "umount $TARGET/proc/bus/usb"
+    on_exit "umount $TARGET/proc"
+    umount $TARGET/proc 2>/dev/null || true
+    in_target mount -t proc proc /proc
+  fi
 }
 
 setup_devices () {
-  if [ -e $DEVICES_TARGZ ]; then
-    (cd "$TARGET"; zcat $DEVICES_TARGZ | tar -xf -)
+  if [ -e /bin/settrans ]; then
+    setup_hurd_devices
   else
-    if [ -e /dev/.devfsd ]; then
-      in_target mount -t devfs devfs /dev
+    if [ -e $DEVICES_TARGZ ]; then
+      (cd "$TARGET"; zcat $DEVICES_TARGZ | tar -xf -)
     else
-      error 1 NODEVTGZ "no %s. cannot create devices" "$DEVICES_TARGZ"
+      if [ -e /dev/.devfsd ]; then
+        in_target mount -t devfs devfs /dev
+      else
+        error 1 NODEVTGZ "no %s. cannot create devices" "$DEVICES_TARGZ"
+      fi
     fi
   fi
 }
 
+setup_hurd_devices () {
+  mkdir -p $TARGET/servers/socket
+  /bin/settrans -cfk $TARGET/servers/socket/1 /hurd/pflocal
+  /bin/settrans -cf $TARGET/servers/socket/2 /hurd/pfinet
+  /bin/settrans -cfk $TARGET/servers/exec /hurd/exec
+  /bin/settrans -cf $TARGET/servers/crash-suspend /hurd/crash --suspend
+  /bin/settrans -cf $TARGET/servers/crash-kill /hurd/crash --kill
+  /bin/settrans -cf $TARGET/servers/crash-dump-core /hurd/crash --dump-core
+  /bin/settrans -cf $TARGET/servers/password /hurd/password
+  /bin/settrans -cf $TARGET/servers/default-pager /hurd/proxy-defpager
+  ln -fs crash-kill $TARGET/servers/crash
+  ln -fs 1 $TARGET/servers/socket/local
+  ln -fs 2 $TARGET/servers/socket/inet
+  (cd $TARGET/dev; /sbin/MAKEDEV fd std ptyp ptyq vcs tty1 tty2 tty3 tty4 tty5 tty6)
+}
+
 setup_dselect_method () {
   case "$1" in
     "apt")

--- End Message ---
--- Begin Message --- 
Source: debootstrap
Source-Version: 1.0.2

We believe that the bug you reported is fixed in the latest version of
debootstrap, which is due to be installed in the Debian FTP archive:

debootstrap-udeb_1.0.2_i386.udeb
  to pool/main/d/debootstrap/debootstrap-udeb_1.0.2_i386.udeb
debootstrap_1.0.2.dsc
  to pool/main/d/debootstrap/debootstrap_1.0.2.dsc
debootstrap_1.0.2.tar.gz
  to pool/main/d/debootstrap/debootstrap_1.0.2.tar.gz
debootstrap_1.0.2_all.deb
  to pool/main/d/debootstrap/debootstrap_1.0.2_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 314311@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Otavio Salvador <otavio@debian.org> (supplier of updated debootstrap package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Tue, 07 Aug 2007 20:12:55 -0300
Source: debootstrap
Binary: debootstrap-udeb debootstrap
Architecture: source all i386
Version: 1.0.2
Distribution: unstable
Urgency: low
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Otavio Salvador <otavio@debian.org>
Description: 
 debootstrap - Bootstrap a basic Debian system
 debootstrap-udeb - Bootstrap the Debian system (udeb)
Closes: 294484 314304 314311 387673 436218
Changes: 
 debootstrap (1.0.2) unstable; urgency=low
 .
   [ Joey Hess ]
   * Document --components in man page.
   * Update man page, as packages listed in --include should now be auto
     dep-resolved by default.
 .
   [ Colin Watson ]
   * Extensive quoting fixes, allowing installation to a target containing
     spaces (closes: #387673).
   * scripts/debian/sid: Handle libc0.3 on hurd-i386 (thanks, Michael Banck;
     closes: #314304).
   * functions: Stub out /proc setup and add device setup for the Hurd
     (thanks, Michael Banck; closes: #314311).
   * Add --version option (closes: #294484).
 .
   [ Otavio Salvador ]
   * Fix bunzip2 path. Thanks Martín Ferrari <martin.ferrari@gmail.com> by
     the patch (closes: #436218).
Files: 
 460b0ee3ea66561f305753a7aa96ae38 801 admin - debootstrap_1.0.2.dsc
 b6dfc66dfa3cf5cb9ecd744c2b6ca7b6 47728 admin - debootstrap_1.0.2.tar.gz
 cf562ad433b177b1ba03f9006c3f98d6 49044 admin extra debootstrap_1.0.2_all.deb
 5a05a8114712694c33184e857f33adc8 49290 debian-installer required debootstrap-udeb_1.0.2_i386.udeb
Package-Type: udeb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFGuP6GLqiZQEml+FURAt45AJ45Tz17Mds7yRU74iO1XN4rVnIDVwCgo8aW
39x9E9kVvBtT2S4t2P0hDYU=
=03Z1
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: