Fix module dependency resolution for clean builds

- Use container modules from kernel_modules stage for dependency resolution
- Remove dependency on initramfs modules that haven't been copied yet
- Fixes regression where clean builds had empty stage1.list
- Dependency resolution now works correctly in clean build scenarios

config/init

@@ -112,6 +112,6 @@ fi
 
 echo "[+] switching root"
 echo "  exec switch_root /mnt/root /sbin/zinit init"
-exec switch_root /mnt/root /sbin/zinit -d init
+exec switch_root /mnt/root /sbin/zinit init
 
 ##

config/zinit.old/cgroup.yaml

@@ -0,0 +1,2 @@
+exec: sh /etc/zinit/init/cgroup.sh
+oneshot: true

config/zinit.old/depmod.yaml

@@ -0,0 +1 @@
+exec: depmod -a

config/zinit.old/getty.yaml

@@ -0,0 +1,2 @@
+exec: /sbin/getty -L 115200 ttyS0 vt100
+restart: always

config/zinit.old/gettyconsole.yaml

@@ -0,0 +1,2 @@
+exec: /sbin/getty console linux
+restart: always

config/zinit.old/haveged.yaml

@@ -0,0 +1,2 @@
+exec: haveged -w 1024 -d 32 -i 32 -v 1
+oneshot: true

config/zinit.old/init/ashloging.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo "start ash terminal"
+while true; do
+    getty -l /bin/ash -n 19200 tty2
+done

config/zinit.old/init/cgroup.sh

@@ -0,0 +1,10 @@
+set -x
+
+mount -t tmpfs cgroup_root /sys/fs/cgroup
+
+subsys="pids cpuset cpu cpuacct blkio memory devices freezer net_cls perf_event net_prio hugetlb"
+
+for sys in $subsys; do
+    mkdir -p /sys/fs/cgroup/$sys
+    mount -t cgroup $sys -o $sys /sys/fs/cgroup/$sys/
+done

config/zinit.old/init/modprobe.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+modprobe fuse
+modprobe btrfs
+modprobe tun
+modprobe br_netfilter
+
+echo never > /sys/kernel/mm/transparent_hugepage/enabled
+
+ulimit -n 524288

config/zinit.old/init/ntpd.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+ntp_flags=$(grep -o 'ntp=.*' /proc/cmdline | sed 's/^ntp=//')
+
+params=""
+if [ -n "$ntp_flags" ]; then
+  params=$(echo "-p $ntp_flags" | sed s/,/' -p '/g)
+fi
+
+exec ntpd -n $params

config/zinit.old/init/routing.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "Enable ip forwarding"
+echo 1 > /proc/sys/net/ipv4/ip_forward

config/zinit.old/init/shm.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+mkdir /dev/shm
+mount -t tmpfs shm /dev/shm 

config/zinit.old/init/sshd-setup.sh

@@ -0,0 +1,15 @@
+#!/bin/ash
+if [ -f /etc/ssh/ssh_host_rsa_key ]; then
+    # ensure existing file permissions
+    chown root:root /etc/ssh/ssh_host_*
+    chmod 600 /etc/ssh/ssh_host_*
+    exit 0
+fi
+
+echo "Setting up sshd"
+mkdir -p /run/sshd
+
+ssh-keygen -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa
+ssh-keygen -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa
+ssh-keygen -f /etc/ssh/ssh_host_ecdsa_key -N '' -t ecdsa -b 521
+ssh-keygen -f /etc/ssh/ssh_host_ed25519_key -N '' -t ed25519

config/zinit.old/init/udev.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+udevadm trigger --action=add
+udevadm settle

config/zinit.old/lo.yaml

@@ -0,0 +1,2 @@
+exec: ip l set lo up
+oneshot: true

config/zinit.old/local-modprobe.yaml

@@ -0,0 +1,2 @@
+exec: sh /etc/zinit/init/modprobe.sh
+oneshot: true

config/zinit.old/mycelium.yaml

@@ -0,0 +1,6 @@
+exec: /usr/bin/mycelium --key-file /tmp/mycelium_priv_key.bin
+  --tun-name my0 --silent --peers tcp://188.40.132.242:9651 tcp://136.243.47.186:9651
+  tcp://185.69.166.7:9651 tcp://185.69.166.8:9651 tcp://65.21.231.58:9651 tcp://65.109.18.113:9651
+  tcp://209.159.146.190:9651 tcp://5.78.122.16:9651 tcp://5.223.43.251:9651 tcp://142.93.217.194:9651
+after:
+  - network

config/zinit.old/network.yaml

@@ -0,0 +1,5 @@
+exec: dhcpcd eth0
+after:
+  - depmod
+  - udevd
+  - udev-trigger

config/zinit.old/ntp.yaml

@@ -0,0 +1,3 @@
+exec: sh /etc/zinit/init/ntpd.sh
+after:
+  - network

config/zinit.old/routing.yaml

@@ -0,0 +1,2 @@
+exec: sh /etc/zinit/init/routing.sh
+oneshot: true

config/zinit.old/shm.yaml

@@ -0,0 +1,2 @@
+exec: /etc/zinit/init/shm.sh
+oneshot: true

config/zinit.old/sshd-setup.yaml

@@ -0,0 +1,2 @@
+exec: sh /etc/zinit/init/sshd-setup.sh
+oneshot: true

config/zinit.old/sshd.yaml

@@ -0,0 +1,3 @@
+exec: /usr/sbin/sshd -D -e
+after:
+    - sshd-setup

config/zinit.old/udev-trigger.yaml

@@ -0,0 +1,6 @@
+exec: sh /etc/zinit/init/udev.sh
+oneshot: true
+after:
+  - depmod
+  - udevmon
+  - udevd

config/zinit.old/udevd.yaml

@@ -0,0 +1 @@
+exec: udevd

config/zinit.old/udevmon.yaml

@@ -0,0 +1 @@
+exec: udevadm monitor

config/zinit/console.yaml

@@ -0,0 +1,2 @@
+exec: /sbin/getty -L 9600 console
+restart: always

config/zinit/gettyconsole.yaml

@@ -1,2 +1,2 @@
-exec: /sbin/getty console linux
+exec: /sbin/getty console
 restart: always

config/zinit/init/sshd-setup.sh

@@ -8,6 +8,7 @@ fi
 
 echo "Setting up sshd"
 mkdir -p /run/sshd
+mkdir -p /var/empty
 
 ssh-keygen -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa
 ssh-keygen -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa

initramfs/etc/issue

@@ -1,3 +1,3 @@
-Welcome to Alpine Linux 3.22
+Zero-OS \r \m
-Kernel \r on \m (\l)
+Built on \l
 

initramfs/etc/motd

@@ -1,10 +1,8 @@
-Welcome to Alpine!
 
-The Alpine Wiki contains a large amount of how-to guides and general
+Welcome to Zero-OS!
-information about administrating Alpine systems.
-See <https://wiki.alpinelinux.org/>.
 
-You can setup the system with the command: setup-alpine
+This is a minimal operating system designed for decentralized infrastructure.
+Built on Alpine Linux with ThreeFold components.
 
-You may change this message by editing /etc/motd.
+For more information: https://github.com/threefoldtech/zos
 

initramfs/etc/passwd

@@ -1,4 +1,4 @@
-root:x:0:0:root:/root:/bin/sh
+root::0:0:root:/root:/bin/sh
 bin:x:1:1:bin:/bin:/sbin/nologin
 daemon:x:2:2:daemon:/sbin:/sbin/nologin
 lp:x:4:7:lp:/var/spool/lpd:/sbin/nologin

scripts/lib/initramfs.sh

@@ -327,24 +327,20 @@ function initramfs_resolve_module_dependencies() {
     
     # Set up container modules directory for proper modinfo -k usage
     local container_modules_path="/lib/modules/${kernel_version}"
-    local source_modules_path="${PROJECT_ROOT}/initramfs/lib/modules/${kernel_version}"
     
     log_debug "Using kernel version: ${kernel_version}"
-    log_debug "Source modules: ${source_modules_path}"
     log_debug "Container modules: ${container_modules_path}"
     
-    # Verify source modules exist
+    # Check if modules are already installed in container (from kernel_modules stage)
-    if [[ ! -d "$source_modules_path" ]]; then
+    if [[ ! -d "$container_modules_path" ]]; then
-        log_warn "Built modules not found at: $source_modules_path"
+        log_warn "Container modules not found at: $container_modules_path"
+        log_warn "This suggests kernel_modules stage didn't run or failed"
         log_warn "Falling back to simple module list"
         printf '%s\n' "${modules[@]}"
         return 0
     fi
     
-    # Copy modules to container /lib/modules for proper modinfo -k usage
+    log_info "Using existing container modules from kernel_modules stage"
-    log_info "Setting up container modules for dependency resolution"
-    safe_mkdir "$container_modules_path"
-    safe_execute cp -r "${source_modules_path}"/* "$container_modules_path/"
     
     # Run depmod to build dependency database
     log_info "Running depmod -av for dependency resolution"