diff options
| author | Anton Kling <anton@kling.gg> | 2024-12-12 16:03:08 +0100 |
|---|---|---|
| committer | Anton Kling <anton@kling.gg> | 2024-12-12 16:03:08 +0100 |
| commit | b033314bf1901d436dc71d41d5e1f37dda47e511 (patch) | |
| tree | 120bd137888a7f96904a47af7d20422608ffe225 /meta | |
| parent | dcbcdbdc5bcfb86eca05fb655e3bf009d89e39e0 (diff) | |
formatting: Use clang-format on all projects
This commit also add braces to all `if` statements.
Diffstat (limited to 'meta')
| -rwxr-xr-x | meta/run.sh | 17 | ||||
| -rwxr-xr-x | meta/sync.sh | 2 | ||||
| -rwxr-xr-x | meta/userland.sh | 1 |
3 files changed, 17 insertions, 3 deletions
diff --git a/meta/run.sh b/meta/run.sh index ae70780..f5f5d9f 100755 --- a/meta/run.sh +++ b/meta/run.sh @@ -2,10 +2,23 @@ scriptdir="$(dirname "$0")" cd "$scriptdir" cd .. -qemu-system-i386 -enable-kvm -machine kernel_irqchip=off -netdev user,id=n0,hostfwd=tcp:127.0.0.1:6001-:6000 -device rtl8139,netdev=n0 -object filter-dump,id=id,netdev=n0,file=./logs/netout -no-reboot -no-shutdown -chardev stdio,id=char0,logfile=./logs/serial.log,signal=off -serial chardev:char0 -drive id=disk,file=./meta/ext2.img,if=none -device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -m 256M -cdrom ./kernel/myos.iso -d int -s # 2> interrupts +#qemu-system-i386 -enable-kvm \ +#~/rg/qemu-9.0.1/build/qemu-system-i386 -display sdl -enable-kvm \ +# -device virtio-net-pci,netdev=n0,mac=00:00:11:11:11:11 \ +#~/rg/qemu/build/qemu-system-i386 -d int -display sdl \ +~/rg/qemu/build/qemu-system-i386 -enable-kvm -display sdl \ + -netdev user,id=n0,hostfwd=tcp:127.0.0.1:6001-:80,hostfwd=tcp:127.0.0.1:6000-:22\ + -object filter-dump,maxlen=1024000,id=id,netdev=n0,file=./logs/netout\ + -no-reboot -no-shutdown\ + -device rtl8139,netdev=n0\ + -chardev stdio,id=char0,logfile=./logs/serial.log,signal=off\ + -serial chardev:char0 -drive id=disk,file=./meta/ext2.img,if=none\ + -device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0\ + -audio driver=sdl,model=ac97,id=0\ + -m 2G -cdrom ./kernel/myos.iso -s # 2> interrupts # Sync the sysroot cd ./meta/ mkdir ./mount sudo mount ./ext2.img ./mount -sudo cp -r ./mount/* ../sysroot/ +sudo rsync ./mount/ ../sysroot/ sudo umount ./ext2.img diff --git a/meta/sync.sh b/meta/sync.sh index ab56757..9bbf2b1 100755 --- a/meta/sync.sh +++ b/meta/sync.sh @@ -7,6 +7,6 @@ cd "$scriptdir" # Sync the sysroot with the bootable image mkdir ./mount sudo mount ext2.img mount -sudo cp -r ../sysroot/* ./mount/ +sudo rsync ../sysroot/ ./mount/ sudo umount mount rmdir ./mount diff --git a/meta/userland.sh b/meta/userland.sh index 2307f02..b38ae4a 100755 --- a/meta/userland.sh +++ b/meta/userland.sh @@ -59,4 +59,5 @@ ln -s ./minibox ./rdate ln -s ./minibox ./sh ln -s ./minibox ./true ln -s ./minibox ./false +ln -s ./minibox ./lock cd .. |