mawalu
/
qsandbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: mawalu:main
Branches Tags
mawalu:main
mawalu:nim
..
compare: mawalu:nim
Branches Tags
mawalu:main
mawalu:nim

No commits in common. "main" and "nim" have entirely different histories.
main ... nim

4 changed files with 20 additions and 29 deletions
Show Stats Expand all files Collapse all files

4
build.sh
View File

@ -32,8 +32,8 @@ pacman-key --init
pacman-key --populate archlinux pacman-key --populate archlinux
pacman -Syu --noconfirm pacman -Syu --noconfirm
pacman -S --noconfirm base linux linux-firmware mkinitcpio openssh kitty-terminfo dhcpcd pacman -S --noconfirm base linux linux-firmware mkinitcpio openssh kitty-terminfo
systemctl enable sshd dhcpcd systemctl enable sshd
# Standard Archlinux Setup # Standard Archlinux Setup
ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime

1
nim/README.md
View File

@ -1 +0,0 @@
nim rewrite, wip

42
nim/commands/qemu.nim
View File

@ -15,9 +15,8 @@ proc mount(source: cstring, target: cstring, filesystemtype: cstring,
mountflags: culong, data: pointer): cint {.importc, header:"<sys/mount.h>"} mountflags: culong, data: pointer): cint {.importc, header:"<sys/mount.h>"}
const const
UID_MAP = "/proc/self/uid_map"
GID_MAP = "/proc/self/gid_map" GID_MAP = "/proc/self/gid_map"
SETGROUPS = "/proc/self/setgroups" UID_MAP = "/proc/self/uid_map"
proc virtiofsd(paths: seq[string]): Pid = proc virtiofsd(paths: seq[string]): Pid =
let uid = getuid() let uid = getuid()
@ -37,7 +36,6 @@ proc virtiofsd(paths: seq[string]): Pid =
# map our uid to root # map our uid to root
writeFile(UID_MAP, &"0 {uid} 1") writeFile(UID_MAP, &"0 {uid} 1")
writeFile(SETGROUPS, "deny")
writeFile(GID_MAP, &"0 {gid} 1") writeFile(GID_MAP, &"0 {gid} 1")
# create a tmpfs in /var/run so virtiofsd can write there # create a tmpfs in /var/run so virtiofsd can write there
@ -63,35 +61,29 @@ proc virtiofsd(paths: seq[string]): Pid =
for process in procs: for process in procs:
discard waitForExit(process) discard waitForExit(process)
quit(0)
proc qemu*(args: OptParser) = proc qemu*(args: OptParser) =
let childPid = virtiofsd(@["/tmp", "/home"]) let childPid = virtiofsd(@["/tmp", "/home"])
let args = @[
"-enable-kvm", "-cpu", "host", "-m", "512m", "-smp", "2",
"-kernel", "/home/martin/code/qemu/build-image/image/vmlinuz-linux",
"-append", "earlyprintk=ttyS0 console=ttyS0 root=/dev/vda rw quiet",
"-initrd" , "/home/martin/code/qemu/build-image/image/initramfs-linux-custom.img",
"-m", "4G", "-object", "memory-backend-file,id=mem,size=4G,mem-path=/dev/shm,share=on", "-numa", "node,memdev=mem",
"-device", "virtio-rng-pci",
"-bios", "/usr/share/qemu/qboot.rom",
"-drive", "if=virtio,file=/home/martin/code/qemu/build-image/image/image.qcow2",
"-netdev", "user,id=net0,hostfwd=tcp::2222-:22",
"-device", "virtio-net-pci,netdev=net0",
"-nodefaults", "-no-user-config", "-nographic",
"-chardev", "socket,id=share.1,path=/tmp/mount.0.sock",
"-device", "vhost-user-fs-pci,queue-size=1024,chardev=share.1,tag=share.1",
"-serial", "stdio"
]
let qemu = startProcess( let qemu = startProcess(
command = "qemu-system-x86_64", command = "qemu-system-x86_64",
options = {poParentStreams, poUsePath}, options = {poParentStreams, poUsePath},
args = args args = @[
"-enable-kvm", "-cpu", "host", "-m", "512m", "-smp", "2",
"-kernel", "/home/martin/code/qemu/build-image/image/vmlinuz-linux",
"-append", "earlyprintk=ttyS0 console=ttyS0 root=/dev/vda rw quiet",
"-initrd" , "/home/martin/code/qemu/build-image/image/initramfs-linux-custom.img",
"-m", "4G", "-object", "memory-backend-file,id=mem,size=4G,mem-path=/dev/shm,share=on", "-numa", "node,memdev=mem",
"-device", "virtio-rng-pci",
"-bios", "/usr/share/qemu/qboot.rom",
"-drive", "if=virtio,file=/home/martin/code/qemu/build-image/image/image.qcow2",
"-netdev", "user,id=net0,hostfwd=tcp::2222-:22",
"-device", "virtio-net-pci,netdev=net0",
"-nodefaults", "-no-user-config", "-nographic",
"-serial", "stdio"
]
) )
discard waitForExit(qemu) discard waitForExit(qemu)
discard kill(childPid, SIGTERM) #discard kill(childPid, SIGTERM)
discard waitPid(childPid,cast[var cint](nil),0) #discard waitPid(childPid,cast[var cint](nil),0)