From 347a33bd7ef5b94bda74fb867fac8d3c1c5b53c1 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 13 Jan 2024 18:27:36 -0800
Subject: [PATCH] external sources arg

---
 rootfs.py                     |  4 +--
 steps/improve/finalize_fhs.sh | 54 ++---------------------------------
 2 files changed, 4 insertions(+), 54 deletions(-)

diff --git a/rootfs.py b/rootfs.py
index 9b91bf9d..ac24c932 100755
--- a/rootfs.py
+++ b/rootfs.py
@@ -41,8 +41,8 @@ def create_configuration_file(args):
         config.write(f"FINAL_JOBS={args.cores}\n")
         config.write(f"INTERNAL_CI={args.internal_ci or False}\n")
         config.write(f"INTERACTIVE={args.interactive}\n")
-        config.write(f"QEMU={args.qemu}\n")
-        config.write(f"BARE_METAL={args.bare_metal or (args.qemu and args.interactive)}\n")
+        config.write(f"BARE_METAL={args.bare_metal}\n")
+        config.write(f"EXTERNAL_SOURCES={args.external_sources}\n")
         if (args.bare_metal or args.qemu) and not args.kernel:
             if args.repo or args.external_sources:
                 config.write("DISK=sdb1\n")
diff --git a/steps/improve/finalize_fhs.sh b/steps/improve/finalize_fhs.sh
index 94658ab0..6c5e6d51 100755
--- a/steps/improve/finalize_fhs.sh
+++ b/steps/improve/finalize_fhs.sh
@@ -16,58 +16,8 @@ mount | grep '/sys' &> /dev/null || (mkdir -p /sys; mount -t sysfs sysfs /sys)
 mount | grep '/tmp' &> /dev/null || (mkdir -p /tmp; mount -t tmpfs tmpfs /tmp)
 mount | grep '/dev/shm' &> /dev/null || (mkdir -p /dev/shm; mount -t tmpfs tmpfs /dev/shm)
 
-if [ "${CHROOT}" = False ]; then
-    rm /etc/mtab
-    ln -s /proc/mounts /etc/mtab
-fi
-
-# Add /etc/resolv.conf
-if [ ! -e "/etc/resolv.conf" ]; then
+if [ "${EXTERNAL_SOURCES}" = "False" ]; then
+    # Add /etc/resolv.conf
     echo 'nameserver 1.1.1.1' > /etc/resolv.conf
-fi
-if [ ! -e "/etc/resolv.conf/head" ]; then
     echo 'nameserver 1.1.1.1' > /etc/resolv.conf.head
 fi
-
-# /etc/passwd -- taken from LFS
-if [ ! -e "/etc/passwd" ]; then
-    cat > /etc/passwd << "EOF"
-root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/dev/null:/usr/bin/false
-daemon:x:6:6:Daemon User:/dev/null:/usr/bin/false
-messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/usr/bin/false
-uuidd:x:80:80:UUID Generation Daemon User:/dev/null:/usr/bin/false
-nobody:x:65534:65534:Unprivileged User:/dev/null:/usr/bin/false
-EOF
-fi
-
-# /etc/group -- taken from LFS
-if [ ! -e "/etc/group" ]; then
-    cat > /etc/group << "EOF"
-root:x:0:
-bin:x:1:daemon
-sys:x:2:
-kmem:x:3:
-tape:x:4:
-tty:x:5:
-daemon:x:6:
-floppy:x:7:
-disk:x:8:
-lp:x:9:
-dialout:x:10:
-audio:x:11:
-video:x:12:
-utmp:x:13:
-usb:x:14:
-cdrom:x:15:
-adm:x:16:
-messagebus:x:18:
-input:x:24:
-mail:x:34:
-kvm:x:61:
-uuidd:x:80:
-wheel:x:97:
-users:x:999:
-nogroup:x:65534:
-EOF
-fi