Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename netboot to netinit, makes more sense

Browse Source
This commit is contained in:
K. Lange 2018-07-01 17:32:50 +09:00
parent ff1338d137
commit 3700630f0e
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -5,7 +5,7 @@
.make/* .make/*
base/bin/* base/bin/*
cdrom/kernel cdrom/kernel
cdrom/netboot cdrom/netinit
cdrom/mod/* cdrom/mod/*
cdrom/ramdisk.img cdrom/ramdisk.img
cdrom/boot/boot.sys cdrom/boot/boot.sys

4
Makefile
View File

@ -154,7 +154,7 @@ endif
base/bin/init: apps/init.c base/lib/libc.a | dirs base/bin/init: apps/init.c base/lib/libc.a | dirs
$(CC) -static -Wl,-static $(CFLAGS) -o $@ $< $(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 $@ $< $(CC) -s -static -Wl,-static $(CFLAGS) -o $@ $<
# Userspace applications # 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 # 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 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 # Boot loader

10
boot/cstuff.c
View File

@ -23,7 +23,7 @@
#define DEFAULT_SINGLE_CMDLINE "start=terminal " #define DEFAULT_SINGLE_CMDLINE "start=terminal "
#define DEFAULT_TEXT_CMDLINE "start=--vga " #define DEFAULT_TEXT_CMDLINE "start=--vga "
#define DEFAULT_VID_CMDLINE "vid=auto,1440,900 " #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 MIGRATE_CMDLINE "start=--migrate _"
#define DEBUG_LOG_CMDLINE "logtoserial=3 " #define DEBUG_LOG_CMDLINE "logtoserial=3 "
#define DEBUG_SERIAL_CMDLINE "kdebug " #define DEBUG_SERIAL_CMDLINE "kdebug "
@ -121,7 +121,7 @@ int kmain() {
"Start a kernel debug shell on the first", "Start a kernel debug shell on the first",
"serial port."); "serial port.");
BOOT_OPTION(_netboot, 0, "Netboot", BOOT_OPTION(_netinit, 0, "Netinit",
"Downloads a userspace filesystem from a remote", "Downloads a userspace filesystem from a remote",
"server and extracts it at boot."); "server and extracts it at boot.");
@ -129,9 +129,9 @@ int kmain() {
show_menu(); show_menu();
/* Build our command line. */ /* Build our command line. */
if (_netboot) { if (_netinit) {
strcat(cmdline, DEFAULT_NETBOOT_CMDLINE); strcat(cmdline, DEFAULT_NETINIT_CMDLINE);
ramdisk_path = "NETBOOT."; ramdisk_path = "NETINIT.";
} else { } else {
strcat(cmdline, DEFAULT_ROOT_CMDLINE); strcat(cmdline, DEFAULT_ROOT_CMDLINE);

6
util/netboot-init.c → util/netinit.c
View File

@ -3,7 +3,7 @@
* of the NCSA / University of Illinois License - see LICENSE.md * of the NCSA / University of Illinois License - see LICENSE.md
* Copyright (C) 2015-2017 Kevin Lange * Copyright (C) 2015-2017 Kevin Lange
* *
* netboot-init * netinit
* *
* Download, decompress, and mount a root filesystem from the * Download, decompress, and mount a root filesystem from the
* network and run the `/bin/init` contained therein. * network and run the `/bin/init` contained therein.
@ -462,7 +462,7 @@ int main(int argc, char * argv[]) {
signal(SIGWINEVENT, update_video); 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("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"); 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(" 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"); TRACE("\n");