MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-07-06 19:48:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'netboot' into 'master'

Browse Source 
Add support for netboot

See merge request redox-os/redox!1583
This commit is contained in:
bjorn3 2025-06-12 16:51:25 +00:00
commit b486d4bfb6
4 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -13,6 +13,12 @@ live:
rm -f $(BUILD)/livedisk.iso rm -f $(BUILD)/livedisk.iso
$(MAKE) $(BUILD)/livedisk.iso $(MAKE) $(BUILD)/livedisk.iso
netboot:
-$(FUMOUNT) $(BUILD)/filesystem/ || true
-$(FUMOUNT) /tmp/redox_installer/ || true
rm -rf $(BUILD)/livedisk.iso $(BUILD)/tftproot
$(MAKE) $(BUILD)/tftproot
popsicle: $(BUILD)/livedisk.iso popsicle: $(BUILD)/livedisk.iso
popsicle-gtk $(BUILD)/livedisk.iso popsicle-gtk $(BUILD)/livedisk.iso

9
mk/disk.mk
View File

@ -21,9 +21,16 @@ $(BUILD)/livedisk.iso: $(HOST_FSTOOLS) $(REPO_TAG)
FILESYSTEM_SIZE=$(shell $(INSTALLER) --filesystem-size -c $(FILESYSTEM_CONFIG)); \ FILESYSTEM_SIZE=$(shell $(INSTALLER) --filesystem-size -c $(FILESYSTEM_CONFIG)); \
fi && \ fi && \
truncate -s "$$FILESYSTEM_SIZE"m $@.partial truncate -s "$$FILESYSTEM_SIZE"m $@.partial
umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) --live $@.partial umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) --write-bootloader="$(BUILD)/bootloader-live.efi" --live $@.partial
mv $@.partial $@ mv $@.partial $@
$(BUILD)/tftproot: $(HOST_FSTOOLS) $(REPO_TAG) $(BUILD)/livedisk.iso
rm -r $(BUILD)/tftproot || true
mkdir $(BUILD)/tftproot
cp $(BUILD)/bootloader-live.efi $(BUILD)/tftproot/bootloader-live.efi
ln -s ../livedisk.iso $(BUILD)/tftproot/redox-live.img
cp redox.ipxe $(BUILD)/tftproot/redox.ipxe
$(BUILD)/filesystem.img: $(HOST_FSTOOLS) $(REPO_TAG) $(BUILD)/filesystem.img: $(HOST_FSTOOLS) $(REPO_TAG)
mkdir -p $(BUILD) mkdir -p $(BUILD)
-$(FUMOUNT) $(BUILD)/filesystem/ || true -$(FUMOUNT) $(BUILD)/filesystem/ || true

14
mk/qemu.mk
View File

@ -2,6 +2,7 @@
QEMU=SDL_VIDEO_X11_DGAMOUSE=0 qemu-system-$(QEMU_ARCH) QEMU=SDL_VIDEO_X11_DGAMOUSE=0 qemu-system-$(QEMU_ARCH)
QEMUFLAGS=-d guest_errors -name "Redox OS $(ARCH)" QEMUFLAGS=-d guest_errors -name "Redox OS $(ARCH)"
netboot?=no
ifeq ($(ARCH),i686) ifeq ($(ARCH),i686)
audio?=ac97 audio?=ac97
@ -148,14 +149,19 @@ else
QEMUFLAGS+=-device e1000,netdev=net0,id=nic0 QEMUFLAGS+=-device e1000,netdev=net0,id=nic0
endif endif
EXTRANETARGS=
ifeq ($(netboot),yes)
EXTRANETARGS+=,tftp=$(BUILD)/tftproot,bootfile=redox.ipxe
endif
ifneq ($(bridge),) ifneq ($(bridge),)
QEMUFLAGS+=-netdev bridge,br=$(bridge),id=net0 QEMUFLAGS+=-netdev bridge,br=$(bridge),id=net0
else ifeq ($(net),redir) else ifeq ($(net),redir)
# port 8080 and 8083 - webservers # port 8080 and 8083 - webservers
# port 64126 - our gdbserver implementation # port 64126 - our gdbserver implementation
QEMUFLAGS+=-netdev user,id=net0,hostfwd=tcp::8080-:8080,hostfwd=tcp::8083-:8083,hostfwd=tcp::64126-:64126 QEMUFLAGS+=-netdev user,id=net0,hostfwd=tcp::8080-:8080,hostfwd=tcp::8083-:8083,hostfwd=tcp::64126-:64126$(EXTRANETARGS)
else else
QEMUFLAGS+=-netdev user,id=net0 -object filter-dump,id=f1,netdev=net0,file=$(BUILD)/network.pcap QEMUFLAGS+=-netdev user,id=net0$(EXTRANETARGS) -object filter-dump,id=f1,netdev=net0,file=$(BUILD)/network.pcap
endif endif
endif endif
@ -236,6 +242,10 @@ qemu-deps:$(FIRMWARE)
qemu-deps:$(QEMU_KERNEL) qemu-deps:$(QEMU_KERNEL)
ifeq ($(netboot),yes)
qemu-deps: $(BUILD)/tftproot
endif
qemu-deps: $(PFLASH0) qemu-deps: $(PFLASH0)
ifneq ($(PFLASH1),) ifneq ($(PFLASH1),)

5
redox.ipxe Normal file
View File

@ -0,0 +1,5 @@
#!ipxe
kernel bootloader-live.efi
initrd redox-live.img
boot