Use merged usr throughout the entire bootstrap

steps/improve/finalize_fhs.sh

@@ -3,13 +3,6 @@
 # SPDX-FileCopyrightText: 2023 fosslinux <fosslinux@aussies.space>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
-#
-# Add the rest of the FHS that we will use and is not created pre-boot
-rm -rf /sbin /usr/sbin
-ln -s /usr/bin /usr/sbin
-for d in bin lib sbin; do
-    ln -s "/usr/${d}" "/${d}" || true # these might exist if rerunning
-done
 
 mkdir -p /etc /run /var/log /var/lock /var/spool /var/tmp /var/cache
 

steps/improve/merged_usr.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2023 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# Add the rest of the FHS that we will use and is not created pre-boot
+ln -s bin /usr/sbin
+for d in bin lib sbin; do
+    ln -s "usr/${d}" "/${d}" || true # these might exist if rerunning
+done

steps/manifest

@@ -53,6 +53,7 @@ build: heirloom-devtools-070527
 build: bash-2.05b
 improve: setup_repo
 improve: update_env
+improve: merged_usr
 build: flex-2.5.11
 build: tcc-0.9.27
 improve: musl_libdir