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 | |
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')
-rw-r--r-- | scripts/aequorea | 4 | ||||
-rw-r--r-- | scripts/breezy | 3 | ||||
-rw-r--r-- | scripts/dapper | 3 | ||||
-rw-r--r-- | scripts/edgy | 4 | ||||
-rw-r--r-- | scripts/feisty | 4 | ||||
-rw-r--r-- | scripts/gutsy | 4 | ||||
-rw-r--r-- | scripts/hoary | 3 | ||||
-rw-r--r-- | scripts/hoary.buildd | 3 | ||||
-rw-r--r-- | scripts/potato | 3 | ||||
-rw-r--r-- | scripts/sarge | 3 | ||||
-rw-r--r-- | scripts/sarge.buildd | 3 | ||||
-rw-r--r-- | scripts/sid | 4 | ||||
-rw-r--r-- | scripts/warty | 3 | ||||
-rw-r--r-- | scripts/warty.buildd | 3 | ||||
-rw-r--r-- | scripts/woody | 3 | ||||
-rw-r--r-- | scripts/woody.buildd | 3 |
16 files changed, 34 insertions, 19 deletions
diff --git a/scripts/aequorea b/scripts/aequorea index fddd777..d55eee0 100644 --- a/scripts/aequorea +++ b/scripts/aequorea @@ -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)" @@ -77,7 +79,7 @@ Status: install ok installed" >> "$TARGET/var/lib/dpkg/status" } second_stage_install () { - setup_devices + setup_dynamic_devices x_core_install () { smallyes '' | in_target dpkg --force-depends --install $(debfor "$@") diff --git a/scripts/breezy b/scripts/breezy index e0f0de1..2148cec 100644 --- a/scripts/breezy +++ b/scripts/breezy @@ -44,6 +44,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)" @@ -71,7 +73,6 @@ second_stage_install () { baseprog="$(($baseprog + ${1:-1}))" } - setup_devices setup_proc umount_on_exit /dev/.static/dev umount_on_exit /dev diff --git a/scripts/dapper b/scripts/dapper index 4755240..af83c0c 100644 --- a/scripts/dapper +++ b/scripts/dapper @@ -51,6 +51,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)" @@ -78,7 +80,6 @@ second_stage_install () { baseprog="$(($baseprog + ${1:-1}))" } - setup_devices setup_proc in_target /sbin/ldconfig 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 diff --git a/scripts/feisty b/scripts/feisty index b97b440..b0a4631 100644 --- a/scripts/feisty +++ b/scripts/feisty @@ -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 diff --git a/scripts/gutsy b/scripts/gutsy index bb39bf5..c91c322 100644 --- a/scripts/gutsy +++ b/scripts/gutsy @@ -64,6 +64,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)" @@ -91,8 +93,6 @@ second_stage_install () { baseprog="$(($baseprog + ${1:-1}))" } - setup_devices - if doing_variant fakechroot; then setup_proc_fakechroot else diff --git a/scripts/hoary b/scripts/hoary index 985ace5..e5fe9fc 100644 --- a/scripts/hoary +++ b/scripts/hoary @@ -65,6 +65,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)" @@ -98,7 +100,6 @@ second_stage_install () { baseprog=0 bases=7 - setup_devices setup_proc umount_on_exit /.dev umount_on_exit /dev diff --git a/scripts/hoary.buildd b/scripts/hoary.buildd index f553963..8d10d80 100644 --- a/scripts/hoary.buildd +++ b/scripts/hoary.buildd @@ -61,6 +61,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)" @@ -93,7 +95,6 @@ second_stage_install () { baseprog=0 bases=40 - setup_devices setup_proc in_target /sbin/ldconfig diff --git a/scripts/potato b/scripts/potato index d187100..b6dedab 100644 --- a/scripts/potato +++ b/scripts/potato @@ -54,6 +54,8 @@ Status: install ok installed" >> "$TARGET/var/lib/dpkg/status" touch "$TARGET/var/lib/dpkg/info/${pkg}.list" } + setup_devices + x_feign_install dpkg if [ -e "$TARGET/usr/bin/perl-5.005.dist" ]; then @@ -71,7 +73,6 @@ second_stage_install () { export DEBIAN_FRONTEND=Noninteractive - setup_devices setup_proc ln "$TARGET/sbin/ldconfig.new" "$TARGET/sbin/ldconfig" in_target /sbin/ldconfig diff --git a/scripts/sarge b/scripts/sarge index 719543f..aa37d94 100644 --- a/scripts/sarge +++ b/scripts/sarge @@ -107,6 +107,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)" @@ -134,7 +136,6 @@ second_stage_install () { baseprog="$(($baseprog + ${1:-1}))" } - setup_devices setup_proc in_target /sbin/ldconfig diff --git a/scripts/sarge.buildd b/scripts/sarge.buildd index bc8be10..c674672 100644 --- a/scripts/sarge.buildd +++ b/scripts/sarge.buildd @@ -68,6 +68,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)" @@ -95,7 +97,6 @@ second_stage_install () { baseprog="$(($baseprog + ${1:-1}))" } - setup_devices setup_proc in_target /sbin/ldconfig diff --git a/scripts/sid b/scripts/sid index bf3404f..7b32ac2 100644 --- a/scripts/sid +++ b/scripts/sid @@ -53,6 +53,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)" @@ -73,7 +75,7 @@ Status: install ok installed" >> "$TARGET/var/lib/dpkg/status" } second_stage_install () { - setup_devices + setup_dynamic_devices x_core_install () { smallyes '' | in_target dpkg --force-depends --install $(debfor "$@") diff --git a/scripts/warty b/scripts/warty index d774871..e21a6d8 100644 --- a/scripts/warty +++ b/scripts/warty @@ -53,6 +53,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,7 +86,6 @@ second_stage_install () { DEBCONF_NONINTERACTIVE_SEEN=true export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN - setup_devices setup_proc in_target /sbin/ldconfig diff --git a/scripts/warty.buildd b/scripts/warty.buildd index 7e2fe74..09c5467 100644 --- a/scripts/warty.buildd +++ b/scripts/warty.buildd @@ -61,6 +61,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)" @@ -93,7 +95,6 @@ second_stage_install () { baseprog=0 bases=40 - setup_devices setup_proc in_target /sbin/ldconfig diff --git a/scripts/woody b/scripts/woody index d1b326f..12c65a3 100644 --- a/scripts/woody +++ b/scripts/woody @@ -93,6 +93,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)" @@ -120,7 +122,6 @@ second_stage_install () { baseprog="$(($baseprog + ${1:-1}))" } - setup_devices setup_proc in_target /sbin/ldconfig diff --git a/scripts/woody.buildd b/scripts/woody.buildd index 094fc9a..0dd8d50 100644 --- a/scripts/woody.buildd +++ b/scripts/woody.buildd @@ -68,6 +68,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)" @@ -95,7 +97,6 @@ second_stage_install () { baseprog="$(($baseprog + ${1:-1}))" } - setup_devices setup_proc in_target /sbin/ldconfig |