Skip to content

Commit

Permalink
Kernel: Embrace the SerenityOS name
Browse files Browse the repository at this point in the history
  • Loading branch information
awesomekling committed Dec 29, 2019
1 parent 6a94214 commit fed3416
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Kernel/Process.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1656,7 +1656,7 @@ int Process::sys$uname(utsname* buf)
{
if (!validate_write_typed(buf))
return -EFAULT;
strcpy(buf->sysname, "Serenity");
strcpy(buf->sysname, "SerenityOS");
strcpy(buf->release, "1.0-dev");
strcpy(buf->version, "FIXME");
strcpy(buf->machine, "i686");
Expand Down
4 changes: 2 additions & 2 deletions Kernel/grub.cfg
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
timeout=1

menuentry 'Serenity (normal)' {
menuentry 'SerenityOS (normal)' {
root=hd0,1
multiboot /boot/kernel root=/dev/hda1
}

menuentry 'Serenity (with serial debug)' {
menuentry 'SerenityOS (with serial debug)' {
root=hd0,1
multiboot /boot/kernel serial_debug root=/dev/hda1
}
4 changes: 2 additions & 2 deletions Kernel/grub_gpt.cfg
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
timeout=1

menuentry 'Serenity (normal)' {
menuentry 'SerenityOS (normal)' {
root=hd0,2
multiboot /boot/kernel root=/dev/hda2
}

menuentry 'Serenity (with serial debug)' {
menuentry 'SerenityOS (with serial debug)' {
root=hd0,2
multiboot /boot/kernel serial_debug root=/dev/hda2
}
2 changes: 1 addition & 1 deletion Kernel/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ extern "C" [[noreturn]] void init(u32 physical_address_for_kernel_page_tables)
tty1 = new VirtualConsole(1);
VirtualConsole::switch_to(0);

kprintf("Starting Serenity Operating System...\n");
kprintf("Starting SerenityOS...\n");

MemoryManager::initialize(physical_address_for_kernel_page_tables);

Expand Down
2 changes: 1 addition & 1 deletion Kernel/run
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ elif [ "$1" = "qcmd" ]; then
SERENITY_KERNEL_CMDLINE="$SERENITY_KERNEL_CMDLINE $1"
done
echo "Starting SerenityOS, Commandline: ${SERENITY_KERNEL_CMDLINE}"
# ./run: qemu with serenity with custom commandline
# ./run: qemu with SerenityOS with custom commandline
$SERENITY_QEMU_BIN \
$SERENITY_COMMON_QEMU_ARGS \
-device e1000 \
Expand Down

0 comments on commit fed3416

Please sign in to comment.