diff options
| author | Samuel Thibault <sthibault@debian.org> | 2016-02-18 01:13:12 (GMT) |
|---|---|---|
| committer | Samuel Thibault <sthibault@debian.org> | 2016-02-18 01:13:12 (GMT) |
| commit | 73c96b7fb099b4423039aebdd8c01340858f19d9 (patch) | |
| tree | e719974c22243ca1bd149440e1886c654ec577d9 | |
| parent | aaac37bbff19d26ac19790c70ee9f42ec92f019c (diff) | |
| download | debootstrap-73c96b7fb099b4423039aebdd8c01340858f19d9.zip debootstrap-73c96b7fb099b4423039aebdd8c01340858f19d9.tar.gz debootstrap-73c96b7fb099b4423039aebdd8c01340858f19d9.tar.bz2 | |
hurd: move setting up dev and servers firmlink to setup_proc stage.
Also firmlink proc there.
Thanks Gabriele Giacone for all the investigation!
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | functions | 15 |
2 files changed, 14 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index c7955de..a9ab1e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debootstrap (1.0.79) UNRELEASED; urgency=medium + + * hurd: move setting up dev and servers firmlink to setup_proc stage. Also + firmlink proc there. Thanks Gabriele Giacone for all the investigation! + (Closes: #768102) + + -- Samuel Thibault <sthibault@debian.org> Mon, 15 Feb 2016 23:20:33 +0100 + debootstrap (1.0.78+nmu1) unstable; urgency=medium * Non-maintainer upload. @@ -1021,6 +1021,10 @@ setup_proc () { fi ;; hurd*) + # firmlink $TARGET/{dev,servers,proc} to the system ones. + settrans -a "$TARGET/dev" /hurd/firmlink /dev + settrans -a "$TARGET/servers" /hurd/firmlink /servers + settrans -a "$TARGET/proc" /hurd/firmlink /proc ;; *) umount_on_exit /dev/pts @@ -1084,7 +1088,8 @@ setup_dynamic_devices () { freebsd) mount -t devfs devfs $TARGET/dev ;; hurd*) - setup_devices_hurd ;; + # Use the setup-translators of the hurd package + in_target /usr/lib/hurd/setup-translators -k ;; esac } @@ -1105,14 +1110,6 @@ setup_devices_simple () { ln -s /proc/self/fd/2 $TARGET/dev/stderr } -setup_devices_hurd () { - # Use the setup-translators of the hurd package, and firmlink - # $TARGET/{dev,servers} to the system ones. - in_target /usr/lib/hurd/setup-translators -k - settrans -a $TARGET/dev /hurd/firmlink /dev - settrans -a $TARGET/servers /hurd/firmlink /servers -} - setup_devices_fakechroot () { rm -rf "$TARGET/dev" ln -s /dev "$TARGET" |