diff options
| author | Marco d'Itri <md@linux.it> | 2016-02-18 01:10:50 (GMT) |
|---|---|---|
| committer | Samuel Thibault <sthibault@debian.org> | 2016-02-18 01:10:50 (GMT) |
| commit | aaac37bbff19d26ac19790c70ee9f42ec92f019c (patch) | |
| tree | b84f490c0bf31c20c5e92a147dd6f1659f0bf5ba /scripts/edgy | |
| parent | 745d40d7bb7a7b37885982ac3b06f836131a45d6 (diff) | |
| download | debootstrap-aaac37bbff19d26ac19790c70ee9f42ec92f019c.zip debootstrap-aaac37bbff19d26ac19790c70ee9f42ec92f019c.tar.gz debootstrap-aaac37bbff19d26ac19790c70ee9f42ec92f019c.tar.bz2 | |
Split setup_devices in setup_devices and setup_dynamic_devices,
(setup_devices now only deals with static device nodes) and move the calls
to setup_devices from the beginning of the second stage to the end of the
first stage. setup_dynamic_devices mounts the appropriate filesystems
which provide dynamic device nodes for the architectures which need one
in debootstrap (kfreebsd and hurd). This fixes a bug in --second-stage
introduced in 1.0.34 and exposed by the devices-related changes of 1.0.76:
the second stage debootstrap runs "dpkg --print-architecture >/dev/null" at
the very beginning of the program when /dev is still empty, so it creates an
empty regular file in place of /dev/null and this will cause mknod to fail
later. (Closes: #813232)
Diffstat (limited to 'scripts/edgy')
| -rw-r--r-- | scripts/edgy | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/edgy b/scripts/edgy index 8175a0a..01d6568 100644 --- a/scripts/edgy +++ b/scripts/edgy @@ -57,6 +57,8 @@ first_stage_install () { chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" fi + setup_devices + x_feign_install () { local pkg="$1" local deb="$(debfor $pkg)" @@ -84,8 +86,6 @@ second_stage_install () { baseprog="$(($baseprog + ${1:-1}))" } - setup_devices - if doing_variant fakechroot; then setup_proc_fakechroot else |