Rename Schunix to SchOS; the kernel becomes SchIFT
Removes the "-unix" element and with it any trademark exposure to The
Open Group.
The split follows the ecosystem layout: SchOS is the system, and the
kernel has its own name. Kernel-identity strings are the only places
that take SchIFT -- uname(2) sysname, /proc/version, and the two licence
sentences that say "kernel" outright. That is what every Unix does here:
`uname -s` on Linux reports the kernel, not the distribution. Everything
a user reads as the product -- panic screen, boot menu, error prefixes,
docs, LICENSE, NOTICE -- is SchOS.
schunix.img is schos.img, the logo assets and the musl TLS patch are
renamed, and __SCHUNIX__ is __SCHOS__ (the define and the patch that
consumes it moved together).
Two things the rename broke, both found by the bootcheck suite:
- shmtest wrote "SCHUNIX-MMAP-OK" with a hardcoded length of 15 and
compared it back by hand-counted offsets (m[3]=='U', m[14]=='K').
The shorter marker left the write running two bytes past the literal
and the compare reading past the data, failing a file-backed mmap
that was working correctly. Now written and compared through one
constant with sizeof.
- bootcheck asserted a 31-byte file after appending to
"hello-from-schunix"; the shorter string makes it 29.
Both are the same mistake: a string literal whose length is written out
somewhere else. Full suite green -- base, Tty, Ps, Sock, Fb, Usb, Evdev.
This commit is contained in:
parent
d0f7acf9eb
commit
e04ca28812
83 changed files with 520 additions and 601 deletions
|
|
@ -100,7 +100,7 @@ print16:
|
|||
ret
|
||||
|
||||
bootmsg:
|
||||
.asciz "Schunix booting...\r\n"
|
||||
.asciz "SchOS booting...\r\n"
|
||||
|
||||
.code32
|
||||
start32:
|
||||
|
|
|
|||
|
|
@ -469,8 +469,8 @@ static int
|
|||
boot_menu(void)
|
||||
{
|
||||
const char *items[] = {
|
||||
"Boot Schunix",
|
||||
"Boot Schunix (verbose)",
|
||||
"Boot SchOS",
|
||||
"Boot SchOS (verbose)",
|
||||
"Reboot to firmware setup",
|
||||
};
|
||||
int nitems = 3;
|
||||
|
|
@ -481,7 +481,7 @@ boot_menu(void)
|
|||
|
||||
for (;;) {
|
||||
fill_rect(0, 0, g_width, g_height, SCH_BG);
|
||||
draw_centered(60, "Schunix Boot Manager", SCH_ACCENT);
|
||||
draw_centered(60, "SchOS Boot Manager", SCH_ACCENT);
|
||||
draw_memory_line(84, SCH_DIM);
|
||||
|
||||
for (int i = 0; i < nitems; i++) {
|
||||
|
|
@ -547,7 +547,7 @@ splash(void)
|
|||
|
||||
// The product, not the loader.
|
||||
//
|
||||
// This used to read "Schunix Boot Manager / version 1.0 / Memory: 1023 MB /
|
||||
// This used to read "SchOS Boot Manager / version 1.0 / Memory: 1023 MB /
|
||||
// Press F8 for boot menu...", centred, in gold on purple. Every part of that
|
||||
// is something a system shows its developer rather than its user: the name
|
||||
// of the component doing the work, its version, and a memory figure nobody
|
||||
|
|
@ -605,7 +605,7 @@ stage2main(void)
|
|||
|
||||
if (g_have_fb) {
|
||||
fill_rect(0, 0, g_width, g_height, SCH_BG);
|
||||
draw_string((g_width - 7 * 8) / 2, g_height / 2 - 50, "SCHUNIX", SCH_ACCENT, SCH_BG);
|
||||
draw_string((g_width - 7 * 8) / 2, g_height / 2 - 50, "SCHOS", SCH_ACCENT, SCH_BG);
|
||||
}
|
||||
|
||||
// Booted from a disc we then could not read. Falling through would send
|
||||
|
|
@ -646,7 +646,7 @@ stage2main(void)
|
|||
stosb((void*) hdr->load_end_addr, 0, hdr->bss_end_addr - hdr->load_end_addr);
|
||||
|
||||
if (g_have_fb)
|
||||
progress_label("Starting Schunix...");
|
||||
progress_label("Starting SchOS...");
|
||||
|
||||
// Jump to kernel entry. NOT a normal C call: kernel/arch/x86_64/
|
||||
// entry.S's mboot_entry reads its "argument" (the framebuffer
|
||||
|
|
|
|||
Loading…
Reference in a new issue