From 3669db9125b7141b234a1bb48dd04a6cc419caeb Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 12 Jan 2024 22:12:47 +1100
Subject: [PATCH] Use merged usr throughout the entire bootstrap

---
 steps/improve/finalize_fhs.sh |  7 -------
 steps/improve/merged_usr.sh   | 10 ++++++++++
 steps/manifest                |  1 +
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100755 steps/improve/merged_usr.sh

diff --git a/steps/improve/finalize_fhs.sh b/steps/improve/finalize_fhs.sh
index e2a238d..e5c67e5 100755
--- a/steps/improve/finalize_fhs.sh
+++ b/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
 
diff --git a/steps/improve/merged_usr.sh b/steps/improve/merged_usr.sh
new file mode 100755
index 0000000..14e79d8
--- /dev/null
+++ b/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
diff --git a/steps/manifest b/steps/manifest
index e05f36c..6d5ad94 100644
--- a/steps/manifest
+++ b/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