Commit Diff


commit - 3ea39b588da17b93f9d50ea134890bc25e4fd0a9
commit + 3220c9e6be61ec9f80562f4f0d8926d14dd790f5
blob - 777c22b9ed12b930deb8833b52f944ed6a5163fb
blob + 7e01a5e5ba2b686f74bf9f84964032ffe934fff2
--- Makefile
+++ Makefile
@@ -37,13 +37,13 @@ clean-busybox:
 full-clean: clean
 	rm -rf src
 
-build/floppy.img: build/kernel data/syslinux.cfg
+build/floppy.img: build/kernel build/initrd.img data/syslinux.cfg
 	dd if=/dev/zero of=$@ bs=1k count=$(SIZE)
 	/usr/sbin/mkdosfs $@
 	syslinux --install $@
 	mkdir -p mp
 	sudo mount -o loop $@ mp
-	sudo cp build/kernel data/syslinux.cfg mp/
+	sudo cp $^ mp/
 	df -h 2>/dev/null | grep -F $(TOP)/mp
 	sudo umount mp
 
@@ -211,16 +211,18 @@ build/.stamp.rootfs: build/.stamp.busybox build/.stamp
 
 build/.stamp.stage2: build/.stamp.linux $(IMAGE)
 	@mkdir -p $(STAGE2)/sbin
-	$(MAKE) -C build/linux ARCH=$(ARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(STAGE2) modules_install
+	#$(MAKE) -C build/linux ARCH=$(ARCH) CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(STAGE2) modules_install
 	cp build/kexec-tools/build/sbin/kexec $(STAGE2)/sbin/
 	cp -H $(IMAGE) $(STAGE2)/
 	$(TARGET)-strip $(STAGE2)/sbin/kexec
 	touch $@
 
-build/.stamp.linux: build/.stamp.linux.src build/linux/.config build/.stamp.rootfs
-	$(MAKE) -C build/linux ARCH=$(ARCH) CROSS_COMPILE=$(TARGET)- bzImage modules
+build/.stamp.linux: build/.stamp.linux.src build/linux/.config
+	$(MAKE) -C build/linux ARCH=$(ARCH) CROSS_COMPILE=$(TARGET)- bzImage #modules
 	touch $@
 
+build/initrd.img: build/.stamp.rootfs
+	cd build/rootfs; find . | cpio --owner=0:0 -H newc -o | xz --check=crc32 -e > $(TOP)/$@
 build/.stamp.kexec.configure: build/.stamp.kexec.src build/.stamp.gcc
 	cd build/kexec-tools &&		\
 	./configure			\
blob - dfa2eacd8f657edcbbe629a5a113209399cc1649
blob + 5a7eaadc95dfb7722bc915f8bb63f2e4ee5d36fd
--- data/bbconfig
+++ data/bbconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.35.0
-# Wed Nov 16 18:32:22 2022
+# Wed Nov 16 21:40:07 2022
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -236,7 +236,7 @@ CONFIG_CP=y
 # CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
 # CONFIG_FEATURE_DD_IBS_OBS is not set
 # CONFIG_FEATURE_DD_STATUS is not set
-CONFIG_DF=y
+# CONFIG_DF is not set
 # CONFIG_FEATURE_DF_FANCY is not set
 # CONFIG_FEATURE_SKIP_ROOTFS is not set
 CONFIG_DIRNAME=y
@@ -269,7 +269,7 @@ CONFIG_LS=y
 # CONFIG_FEATURE_LS_FOLLOWLINKS is not set
 # CONFIG_FEATURE_LS_RECURSIVE is not set
 # CONFIG_FEATURE_LS_WIDTH is not set
-# CONFIG_FEATURE_LS_SORTFILES is not set
+CONFIG_FEATURE_LS_SORTFILES=y
 # CONFIG_FEATURE_LS_TIMESTAMPS is not set
 # CONFIG_FEATURE_LS_USERNAME is not set
 # CONFIG_FEATURE_LS_COLOR is not set
@@ -303,7 +303,7 @@ CONFIG_RMDIR=y
 # CONFIG_SHRED is not set
 # CONFIG_SHUF is not set
 CONFIG_SLEEP=y
-# CONFIG_FEATURE_FANCY_SLEEP is not set
+CONFIG_FEATURE_FANCY_SLEEP=y
 # CONFIG_SORT is not set
 # CONFIG_FEATURE_SORT_BIG is not set
 # CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set
@@ -336,7 +336,7 @@ CONFIG_TRUE=y
 # CONFIG_TRUNCATE is not set
 CONFIG_TTY=y
 CONFIG_UNAME=y
-CONFIG_UNAME_OSNAME="Floppinux"
+CONFIG_UNAME_OSNAME="LANLoader"
 # CONFIG_BB_ARCH is not set
 # CONFIG_UNIQ is not set
 # CONFIG_UNLINK is not set
@@ -402,36 +402,36 @@ CONFIG_DEFAULT_SETFONT_DIR=""
 #
 # Editors
 #
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_LIBM=y
-CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y
+# CONFIG_AWK is not set
+# CONFIG_FEATURE_AWK_LIBM is not set
+# CONFIG_FEATURE_AWK_GNU_EXTENSIONS is not set
 # CONFIG_CMP is not set
 # CONFIG_DIFF is not set
 # CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
 # CONFIG_FEATURE_DIFF_DIR is not set
 # CONFIG_ED is not set
 # CONFIG_PATCH is not set
-CONFIG_SED=y
+# CONFIG_SED is not set
 CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=4096
 # CONFIG_FEATURE_VI_8BIT is not set
 CONFIG_FEATURE_VI_COLON=y
 CONFIG_FEATURE_VI_COLON_EXPAND=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
+# CONFIG_FEATURE_VI_YANKMARK is not set
+# CONFIG_FEATURE_VI_SEARCH is not set
+# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
+# CONFIG_FEATURE_VI_USE_SIGNALS is not set
+# CONFIG_FEATURE_VI_DOT_CMD is not set
 CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
+# CONFIG_FEATURE_VI_SETOPTS is not set
+# CONFIG_FEATURE_VI_SET is not set
+# CONFIG_FEATURE_VI_WIN_RESIZE is not set
 CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_UNDO=y
-CONFIG_FEATURE_VI_UNDO_QUEUE=y
-CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
-CONFIG_FEATURE_VI_VERBOSE_STATUS=y
-CONFIG_FEATURE_ALLOW_EXEC=y
+# CONFIG_FEATURE_VI_UNDO is not set
+# CONFIG_FEATURE_VI_UNDO_QUEUE is not set
+CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0
+# CONFIG_FEATURE_VI_VERBOSE_STATUS is not set
+# CONFIG_FEATURE_ALLOW_EXEC is not set
 
 #
 # Finding Utilities
@@ -555,21 +555,21 @@ CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
 #
 # Linux Module Utilities
 #
-CONFIG_MODPROBE_SMALL=y
+# CONFIG_MODPROBE_SMALL is not set
 # CONFIG_DEPMOD is not set
-CONFIG_INSMOD=y
-CONFIG_LSMOD=y
+# CONFIG_INSMOD is not set
+# CONFIG_LSMOD is not set
 # CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
 # CONFIG_MODINFO is not set
-CONFIG_MODPROBE=y
+# CONFIG_MODPROBE is not set
 # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-CONFIG_RMMOD=y
+# CONFIG_RMMOD is not set
 
 #
 # Options common to multiple modutils
 #
-CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS=y
-CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y
+# CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
 # CONFIG_FEATURE_2_4_MODULES is not set
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
@@ -580,8 +580,8 @@ CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y
 # CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
 # CONFIG_FEATURE_MODUTILS_ALIAS is not set
 # CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
-CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
-CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+CONFIG_DEFAULT_MODULES_DIR=""
+CONFIG_DEFAULT_DEPMOD_FILE=""
 
 #
 # Linux System Utilities
@@ -975,7 +975,7 @@ CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0
 # CONFIG_TUNCTL is not set
 # CONFIG_FEATURE_TUNCTL_UG is not set
 # CONFIG_VCONFIG is not set
-CONFIG_WGET=y
+# CONFIG_WGET is not set
 # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
 # CONFIG_FEATURE_WGET_STATUSBAR is not set
 # CONFIG_FEATURE_WGET_FTP is not set
@@ -1030,12 +1030,12 @@ CONFIG_FEATURE_MIME_CHARSET=""
 # Process Utilities
 #
 CONFIG_FEATURE_FAST_TOP=y
-CONFIG_FEATURE_SHOW_THREADS=y
+# CONFIG_FEATURE_SHOW_THREADS is not set
 CONFIG_FREE=y
 # CONFIG_FUSER is not set
 # CONFIG_IOSTAT is not set
-CONFIG_KILL=y
-CONFIG_KILLALL=y
+# CONFIG_KILL is not set
+# CONFIG_KILLALL is not set
 # CONFIG_KILLALL5 is not set
 # CONFIG_LSOF is not set
 # CONFIG_MPSTAT is not set
@@ -1060,12 +1060,12 @@ CONFIG_KILLALL=y
 # CONFIG_BB_SYSCTL is not set
 CONFIG_TOP=y
 CONFIG_FEATURE_TOP_INTERACTIVE=y
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
-CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
-CONFIG_FEATURE_TOP_SMP_CPU=y
-CONFIG_FEATURE_TOP_DECIMALS=y
-CONFIG_FEATURE_TOP_SMP_PROCESS=y
-CONFIG_FEATURE_TOPMEM=y
+# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
+# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
+# CONFIG_FEATURE_TOP_SMP_CPU is not set
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
+# CONFIG_FEATURE_TOPMEM is not set
 # CONFIG_UPTIME is not set
 # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
 # CONFIG_WATCH is not set
blob - 5b24e4f0686c9c297928e2e4523e62cdc3a9298e
blob + 07b91b1659e8cd0f772367389b80d5af43506b77
--- data/initrd/etc/rc
+++ data/initrd/etc/rc
@@ -2,8 +2,7 @@
 mount -t proc none /proc
 mount -t sysfs none /sys
 
-/boot &
-sleep 1
+(sleep 1; /boot) &
 
 while true; do
 	/bin/sh
blob - 515091ffd484c92389c06e16d1fda9f3adbf587c
blob + 2b291978c460587f71be7f185df84b9b3795f238
--- data/kconfig
+++ data/kconfig
@@ -41,7 +41,7 @@ CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZ4 is not set
 # CONFIG_KERNEL_ZSTD is not set
 CONFIG_DEFAULT_INIT=""
-CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_DEFAULT_HOSTNAME="lanloader"
 # CONFIG_SYSVIPC is not set
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_WATCH_QUEUE is not set
@@ -69,6 +69,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y
+CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y
 
 #
 # Timers subsystem
@@ -118,9 +119,7 @@ CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="../rootfs"
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_ROOT_GID=0
+CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_RD_GZIP is not set
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZMA is not set
@@ -128,8 +127,6 @@ CONFIG_RD_XZ=y
 # CONFIG_RD_LZO is not set
 # CONFIG_RD_LZ4 is not set
 # CONFIG_RD_ZSTD is not set
-CONFIG_INITRAMFS_COMPRESSION_XZ=y
-# CONFIG_INITRAMFS_COMPRESSION_NONE is not set
 # CONFIG_BOOT_CONFIG is not set
 # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -143,7 +140,7 @@ CONFIG_EXPERT=y
 # CONFIG_SGETMASK_SYSCALL is not set
 # CONFIG_SYSFS_SYSCALL is not set
 # CONFIG_FHANDLE is not set
-# CONFIG_POSIX_TIMERS is not set
+CONFIG_POSIX_TIMERS=y
 CONFIG_PRINTK=y
 CONFIG_PRINTK_NMI=y
 # CONFIG_BUG is not set
@@ -419,7 +416,6 @@ CONFIG_KEXEC_CORE=y
 CONFIG_GENERIC_ENTRY=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_OPROFILE_NMI_TIMER=y
-# CONFIG_KPROBES is not set
 # CONFIG_JUMP_LABEL is not set
 # CONFIG_STATIC_CALL_SELFTEST is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -481,7 +477,6 @@ CONFIG_OLD_SIGACTION=y
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 CONFIG_HAVE_STATIC_CALL=y
@@ -499,19 +494,7 @@ CONFIG_HAVE_GCC_PLUGINS=y
 # end of General architecture-dependent options
 
 CONFIG_BASE_SMALL=1
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-# CONFIG_MODULE_UNLOAD is not set
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-CONFIG_MODULE_COMPRESS=y
-# CONFIG_MODULE_COMPRESS_GZIP is not set
-CONFIG_MODULE_COMPRESS_XZ=y
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-CONFIG_TRIM_UNUSED_KSYMS=y
-CONFIG_UNUSED_KSYMS_WHITELIST=""
+# CONFIG_MODULES is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 # CONFIG_BLOCK is not set
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
@@ -635,7 +618,6 @@ CONFIG_HAVE_NET_DSA=y
 # CONFIG_NET_NCSI is not set
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
-# CONFIG_BPF_JIT is not set
 
 #
 # Network testing
@@ -743,7 +725,6 @@ CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
 # end of Generic Driver Options
@@ -1070,6 +1051,7 @@ CONFIG_HW_CONSOLE=y
 #
 # PTP clock support
 #
+# CONFIG_PTP_1588_CLOCK is not set
 
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
@@ -1565,7 +1547,6 @@ CONFIG_PANIC_TIMEOUT=0
 # CONFIG_HARDLOCKUP_DETECTOR is not set
 # CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_WQ_WATCHDOG is not set
-# CONFIG_TEST_LOCKUP is not set
 # end of Debug Oops, Lockups and Hangs
 
 #
blob - eb3ee904c9c3c42945992eef065bc27f99fa54c4
blob + 648fc4609035179f6b8b41c56dc88ced18521019
--- data/syslinux.cfg
+++ data/syslinux.cfg
@@ -2,4 +2,5 @@ DEFAULT linux
 LABEL linux
 	SAY [ LANLoader Linux ]
 	KERNEL kernel ip=dhcp
+	INITRD initrd.img
 EOF