Skip to content

Commit ac11ba4

Browse files
committed
update makefile to run inside the container
1 parent 9a1f2b0 commit ac11ba4

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

Makefile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ QEMU=qemu-system-i386
99
.PHONY: compile run clean disk.img
1010

1111
run: disk.img
12-
tmux split-window -h "$(QEMU) -hda $< -curses -monitor telnet:localhost:4444,server -s -S"
13-
tmux select-pane -L
14-
sleep 1
15-
telnet localhost 4444
12+
$(QEMU) -hda $< -curses
1613

1714
clean:
1815
rm -f arch/x86/boot/*.bin arch/x86/boot/*.o arch/x86/boot/*.img
@@ -22,9 +19,9 @@ kernel.elf: arch/x86/boot/start.o lib.o
2219
$(LD) $(LDFLAGS) arch/x86/boot/linker.ld -o $@ $^
2320

2421
disk.img: kernel.elf
25-
sudo mount -o loop,offset=32256 disk.img /mnt
26-
sudo mv kernel.elf /mnt/boot/
27-
sudo umount /mnt
22+
mount -o loop,offset=32256 disk.img /mnt
23+
mv kernel.elf /mnt/boot/
24+
umount /mnt
2825

2926
%.o: %.asm
3027
$(NASM) $(NASMFLAGS) $@ $<

0 commit comments

Comments
 (0)