RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:57:45 +00:00
Code Issues Activity Actions

Kernel: Embrace the SerenityOS name

Browse source
This commit is contained in:
Andreas Kling 2019-12-29 19:08:02 +01:00
parent 6a94214502
commit fed3416bd2
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Process.cpp
View file

@ -1656,7 +1656,7 @@ int Process::sys$uname(utsname* buf)
{ {
if (!validate_write_typed(buf)) if (!validate_write_typed(buf))
return -EFAULT; return -EFAULT;
strcpy(buf->sysname, "Serenity"); strcpy(buf->sysname, "SerenityOS");
strcpy(buf->release, "1.0-dev"); strcpy(buf->release, "1.0-dev");
strcpy(buf->version, "FIXME"); strcpy(buf->version, "FIXME");
strcpy(buf->machine, "i686"); strcpy(buf->machine, "i686");

4
Kernel/grub.cfg
View file

@ -1,11 +1,11 @@
timeout=1 timeout=1
menuentry 'Serenity (normal)' { menuentry 'SerenityOS (normal)' {
root=hd0,1 root=hd0,1
multiboot /boot/kernel root=/dev/hda1 multiboot /boot/kernel root=/dev/hda1
} }
menuentry 'Serenity (with serial debug)' { menuentry 'SerenityOS (with serial debug)' {
root=hd0,1 root=hd0,1
multiboot /boot/kernel serial_debug root=/dev/hda1 multiboot /boot/kernel serial_debug root=/dev/hda1
} }

4
Kernel/grub_gpt.cfg
View file

@ -1,11 +1,11 @@
timeout=1 timeout=1
menuentry 'Serenity (normal)' { menuentry 'SerenityOS (normal)' {
root=hd0,2 root=hd0,2
multiboot /boot/kernel root=/dev/hda2 multiboot /boot/kernel root=/dev/hda2
} }
menuentry 'Serenity (with serial debug)' { menuentry 'SerenityOS (with serial debug)' {
root=hd0,2 root=hd0,2
multiboot /boot/kernel serial_debug root=/dev/hda2 multiboot /boot/kernel serial_debug root=/dev/hda2
} }

2
Kernel/init.cpp
View file

@ -275,7 +275,7 @@ extern "C" [[noreturn]] void init(u32 physical_address_for_kernel_page_tables)
tty1 = new VirtualConsole(1); tty1 = new VirtualConsole(1);
VirtualConsole::switch_to(0); VirtualConsole::switch_to(0);
kprintf("Starting Serenity Operating System...\n"); kprintf("Starting SerenityOS...\n");
MemoryManager::initialize(physical_address_for_kernel_page_tables); MemoryManager::initialize(physical_address_for_kernel_page_tables);

2
Kernel/run
View file

@ -65,7 +65,7 @@ elif [ "$1" = "qcmd" ]; then
SERENITY_KERNEL_CMDLINE="$SERENITY_KERNEL_CMDLINE $1" SERENITY_KERNEL_CMDLINE="$SERENITY_KERNEL_CMDLINE $1"
done done
echo "Starting SerenityOS, Commandline: ${SERENITY_KERNEL_CMDLINE}" 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_QEMU_BIN \
$SERENITY_COMMON_QEMU_ARGS \ $SERENITY_COMMON_QEMU_ARGS \
-device e1000 \ -device e1000 \