diff --git a/config/redbear-device-services.toml b/config/redbear-device-services.toml index 887ef58bca..8382330650 100644 --- a/config/redbear-device-services.toml +++ b/config/redbear-device-services.toml @@ -519,7 +519,7 @@ requires_weak = [ [service] cmd = "pcid-spawner" -type = "oneshot" +type = "oneshot_async" """ # Firmware fallback chain configs diff --git a/config/redbear-mini.toml b/config/redbear-mini.toml index 837da38d70..679f301201 100644 --- a/config/redbear-mini.toml +++ b/config/redbear-mini.toml @@ -492,7 +492,7 @@ requires_weak = ["00_base.target"] [service] cmd = "inputd" args = ["-A", "2"] -type = "oneshot" +type = "oneshot_async" """ [[files]] diff --git a/local/sources/base b/local/sources/base index a0b05b1fc0..b1a6bd871f 160000 --- a/local/sources/base +++ b/local/sources/base @@ -1 +1 @@ -Subproject commit a0b05b1fc03ca4ca4533a50c5e3cf248a6ad62c0 +Subproject commit b1a6bd871f8ac74d4b54b2d666101fee80d8c5a3 diff --git a/scripts/run_mini1.sh b/scripts/run_mini1.sh index 000ac1bfbc..8f031f1a42 100755 --- a/scripts/run_mini1.sh +++ b/scripts/run_mini1.sh @@ -11,9 +11,9 @@ esac # virtio-gl, native CPU, net boost -qemu-system-x86_64 -m 12G -smp 8 -device qemu-xhci -net nic,model=virtio -net user --enable-kvm -cpu host -display gtk,gl=on -drive if=pflash,format=raw,readonly=on,file=/usr/share/edk2/x64/OVMF_CODE.4m.fd -drive file=/home/kellito/Builds/RedBear-OS/build/x86_64/redbear-mini.iso,format=raw -device virtio-gpu-pci -enable-kvm -serial mon:stdio +qemu-system-x86_64 -m 2G -smp 8 -device qemu-xhci -net nic,model=virtio -net user --enable-kvm -cpu host -display gtk,gl=on -drive if=pflash,format=raw,readonly=on,file=/usr/share/edk2/x64/OVMF_CODE.4m.fd -drive file=/home/kellito/Builds/RedBear-OS/build/x86_64/redbear-mini.iso,format=raw -device virtio-gpu-pci -enable-kvm -serial mon:stdio #qemu-system-x86_64 -m 12G -smp 8 -device qemu-xhci -net nic,model=virtio -net user --enable-kvm -cpu host -display gtk,gl=on -drive if=pflash,format=raw,readonly=on,file=/usr/share/edk2/x64/OVMF_CODE.4m.fd -drive file=/home/kellito/Builds/RedBear-OS/build/x86_64/redbear-full.iso,format=raw -device virtio-gpu-pci -enable-kvm -serial mon:stdio -#qemu-system-x86_64 -d guest_errors -name "Red Bear OS x86_64" -device qemu-xhci -smp 4 -m 2048 -bios /usr/share/edk2/x64/OVMF.4m.fd -chardev stdio,id=debug,signal=off,mux=on -serial chardev:debug -mon chardev=debug -machine q35 -device ich9-intel-hda -device hda-output -device e1000,netdev=net0,id=nic0 -netdev user,id=net0 -nographic -drive file=build/x86_64/redbear-mini/harddrive.img,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL -drive file=build/x86_64/redbear-mini/extra.img,format=raw,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA -enable-kvm -cpu host 2>&1 | tee /tmp/qemu-boot-full.log | tail -n 100 \ No newline at end of file +#qemu-system-x86_64 -d guest_errors -ame "Red Bear OS x86_64" -device qemu-xhci -smp 4 -m 2048 -bios /usr/share/edk2/x64/OVMF.4m.fd -chardev stdio,id=debug,signal=off,mux=on -serial chardev:debug -mon chardev=debug -machine q35 -device ich9-intel-hda -device hda-output -device e1000,netdev=net0,id=nic0 -netdev user,id=net0 -nographic -drive file=build/x86_64/redbear-mini/harddrive.img,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL -drive file=build/x86_64/redbear-mini/extra.img,format=raw,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA -enable-kvm -cpu host 2>&1 | tee /tmp/qemu-boot-full.log | tail -n 100 \ No newline at end of file