Move setup_devices to second stage of bootstrap. Closes: #498731, #531316

16 files changed, 20 insertions, 48 deletions

diff --git a/scripts/breezy b/scripts/breezy
index 2148cec..e0f0de1 100644
--- a/scripts/breezy
+++ b/scripts/breezy
@@ -44,8 +44,6 @@ 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,6 +71,7 @@ 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 af83c0c..4755240 100644
--- a/scripts/dapper
+++ b/scripts/dapper
@@ -51,8 +51,6 @@ 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)"
@@ -80,6 +78,7 @@ second_stage_install () {
 	baseprog="$(($baseprog + ${1:-1}))"
     }
 
+    setup_devices
     setup_proc
     in_target /sbin/ldconfig
 
diff --git a/scripts/edgy b/scripts/edgy
index 3af06de..8175a0a 100644
--- a/scripts/edgy
+++ b/scripts/edgy
@@ -57,12 +57,6 @@ first_stage_install () {
         chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    if doing_variant fakechroot; then
-        setup_devices_fakechroot
-    else
-        setup_devices
-    fi
-
     x_feign_install () {
         local pkg="$1"
         local deb="$(debfor $pkg)"
@@ -90,6 +84,8 @@ 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 30e20d5..b97b440 100644
--- a/scripts/feisty
+++ b/scripts/feisty
@@ -57,12 +57,6 @@ first_stage_install () {
         chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    if doing_variant fakechroot; then
-        setup_devices_fakechroot
-    else
-        setup_devices
-    fi
-
     x_feign_install () {
         local pkg="$1"
         local deb="$(debfor $pkg)"
@@ -90,6 +84,8 @@ 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 705cac5..90e1d5d 100644
--- a/scripts/gutsy
+++ b/scripts/gutsy
@@ -58,12 +58,6 @@ first_stage_install () {
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -91,6 +85,8 @@ 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 e5fe9fc..985ace5 100644
--- a/scripts/hoary
+++ b/scripts/hoary
@@ -65,8 +65,6 @@ 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)"
@@ -100,6 +98,7 @@ 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 8d10d80..f553963 100644
--- a/scripts/hoary.buildd
+++ b/scripts/hoary.buildd
@@ -61,8 +61,6 @@ 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,6 +93,7 @@ second_stage_install () {
     baseprog=0
     bases=40
 
+    setup_devices
     setup_proc
     in_target /sbin/ldconfig
 
diff --git a/scripts/potato b/scripts/potato
index 50dc86a..d187100 100644
--- a/scripts/potato
+++ b/scripts/potato
@@ -39,8 +39,6 @@ first_stage_install () {
     echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab"
     chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 
-    setup_devices
-
     x_feign_install () {
         local pkg=$1
         local deb="$(debfor $pkg)"
@@ -73,6 +71,7 @@ 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 aa37d94..719543f 100644
--- a/scripts/sarge
+++ b/scripts/sarge
@@ -107,8 +107,6 @@ 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)"
@@ -136,6 +134,7 @@ 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 c674672..bc8be10 100644
--- a/scripts/sarge.buildd
+++ b/scripts/sarge.buildd
@@ -68,8 +68,6 @@ 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)"
@@ -97,6 +95,7 @@ second_stage_install () {
 	baseprog="$(($baseprog + ${1:-1}))"
     }
 
+    setup_devices
     setup_proc
     in_target /sbin/ldconfig
 
diff --git a/scripts/sarge.fakechroot b/scripts/sarge.fakechroot
index 51fdbdd..df3ae1b 100644
--- a/scripts/sarge.fakechroot
+++ b/scripts/sarge.fakechroot
@@ -73,8 +73,6 @@ first_stage_install () {
         chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    setup_devices_fakechroot
-
     x_feign_install () {
         local pkg="$1"
         local deb="$(debfor $pkg)"
@@ -102,6 +100,7 @@ second_stage_install () {
 	baseprog="$(($baseprog + ${1:-1}))"
     }
 
+    setup_devices_fakechroot
     setup_proc_fakechroot
 
     DEBIAN_FRONTEND=noninteractive
diff --git a/scripts/sid b/scripts/sid
index 7673764..893d5d5 100644
--- a/scripts/sid
+++ b/scripts/sid
@@ -47,12 +47,6 @@ first_stage_install () {
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -73,6 +67,8 @@ Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"
 }
 
 second_stage_install () {
+	setup_devices
+
 	x_core_install () {
 		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
 	}
diff --git a/scripts/warty b/scripts/warty
index e21a6d8..d774871 100644
--- a/scripts/warty
+++ b/scripts/warty
@@ -53,8 +53,6 @@ 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)"
@@ -86,6 +84,7 @@ 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 09c5467..7e2fe74 100644
--- a/scripts/warty.buildd
+++ b/scripts/warty.buildd
@@ -61,8 +61,6 @@ 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,6 +93,7 @@ second_stage_install () {
     baseprog=0
     bases=40
 
+    setup_devices
     setup_proc
     in_target /sbin/ldconfig
 
diff --git a/scripts/woody b/scripts/woody
index 12c65a3..d1b326f 100644
--- a/scripts/woody
+++ b/scripts/woody
@@ -93,8 +93,6 @@ 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)"
@@ -122,6 +120,7 @@ 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 0dd8d50..094fc9a 100644
--- a/scripts/woody.buildd
+++ b/scripts/woody.buildd
@@ -68,8 +68,6 @@ 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)"
@@ -97,6 +95,7 @@ second_stage_install () {
 	baseprog="$(($baseprog + ${1:-1}))"
     }
 
+    setup_devices
     setup_proc
     in_target /sbin/ldconfig