diff --git a/.gitignore b/.gitignore index 72fc4e33..de4ca1bf 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ .make/* base/bin/* cdrom/kernel -cdrom/netboot +cdrom/netinit cdrom/mod/* cdrom/ramdisk.img cdrom/boot/boot.sys diff --git a/Makefile b/Makefile index 469d6e1b..df492a23 100644 --- a/Makefile +++ b/Makefile @@ -154,7 +154,7 @@ endif base/bin/init: apps/init.c base/lib/libc.a | dirs $(CC) -static -Wl,-static $(CFLAGS) -o $@ $< -cdrom/netboot: util/netboot-init.c base/lib/libc.a | dirs +cdrom/netinit: util/netinit.c base/lib/libc.a | dirs $(CC) -s -static -Wl,-static $(CFLAGS) -o $@ $< # Userspace applications @@ -173,7 +173,7 @@ cdrom/ramdisk.img: ${APPS_X} ${LIBS_X} base/lib/ld.so base/lib/libm.so $(shell f # CD image -image.iso: cdrom/ramdisk.img cdrom/boot/boot.sys cdrom/kernel cdrom/netboot ${MODULES} +image.iso: cdrom/ramdisk.img cdrom/boot/boot.sys cdrom/kernel cdrom/netinit ${MODULES} xorriso -as mkisofs -R -J -c boot/bootcat -b boot/boot.sys -no-emul-boot -boot-load-size 20 -o image.iso cdrom # Boot loader diff --git a/boot/cstuff.c b/boot/cstuff.c index f1c93593..8393b419 100644 --- a/boot/cstuff.c +++ b/boot/cstuff.c @@ -23,7 +23,7 @@ #define DEFAULT_SINGLE_CMDLINE "start=terminal " #define DEFAULT_TEXT_CMDLINE "start=--vga " #define DEFAULT_VID_CMDLINE "vid=auto,1440,900 " -#define DEFAULT_NETBOOT_CMDLINE "init=/dev/ram0 _" +#define DEFAULT_NETINIT_CMDLINE "init=/dev/ram0 _" #define MIGRATE_CMDLINE "start=--migrate _" #define DEBUG_LOG_CMDLINE "logtoserial=3 " #define DEBUG_SERIAL_CMDLINE "kdebug " @@ -121,7 +121,7 @@ int kmain() { "Start a kernel debug shell on the first", "serial port."); - BOOT_OPTION(_netboot, 0, "Netboot", + BOOT_OPTION(_netinit, 0, "Netinit", "Downloads a userspace filesystem from a remote", "server and extracts it at boot."); @@ -129,9 +129,9 @@ int kmain() { show_menu(); /* Build our command line. */ - if (_netboot) { - strcat(cmdline, DEFAULT_NETBOOT_CMDLINE); - ramdisk_path = "NETBOOT."; + if (_netinit) { + strcat(cmdline, DEFAULT_NETINIT_CMDLINE); + ramdisk_path = "NETINIT."; } else { strcat(cmdline, DEFAULT_ROOT_CMDLINE); diff --git a/util/netboot-init.c b/util/netinit.c similarity index 99% rename from util/netboot-init.c rename to util/netinit.c index a3463516..ba105b92 100644 --- a/util/netboot-init.c +++ b/util/netinit.c @@ -3,7 +3,7 @@ * of the NCSA / University of Illinois License - see LICENSE.md * Copyright (C) 2015-2017 Kevin Lange * - * netboot-init + * netinit * * Download, decompress, and mount a root filesystem from the * network and run the `/bin/init` contained therein. @@ -462,7 +462,7 @@ int main(int argc, char * argv[]) { signal(SIGWINEVENT, update_video); } - TRACE("\n\nToaruOS-NIH Netboot Host\n\n"); + TRACE("\n\nToaruOS-NIH Netinit Host\n\n"); TRACE("ToaruOS-NIH is free software under the NCSA / University of Illinois license.\n"); TRACE(" https://toaruos.org/ https://git.toaruos.org/klange/toaru-nih\n\n"); @@ -481,7 +481,7 @@ int main(int argc, char * argv[]) { TRACE(" Kernel was built with: %s\n", kernel_version); } - TRACE(" Netboot binary was built with: %s\n", COMPILER_VERSION); + TRACE(" Netinit binary was built with: %s\n", COMPILER_VERSION); TRACE("\n");