tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2025-04-14 19:58:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from Ccode-lang/master

Browse source 
Fix
This commit is contained in:
TomAwezome 2021-11-29 22:06:17 -05:00 committed by GitHub
commit f882540385
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 17 deletions

20
build/build_iso.sh
View file

@ -8,38 +8,38 @@ echo "Making temp HDD, running auto-install"
qemu-img create -f raw ZealOS.raw 192M qemu-img create -f raw ZealOS.raw 192M
qemu-system-x86_64 -machine q35,kernel_irqchip=off,accel=kvm -drive format=raw,file=ZealOS.raw -m 2G -smp $(nproc) -rtc base=localtime -cdrom AUTO.ISO -device isa-debug-exit qemu-system-x86_64 -machine q35,kernel_irqchip=off,accel=kvm -drive format=raw,file=ZealOS.raw -m 2G -smp $(nproc) -rtc base=localtime -cdrom AUTO.ISO -device isa-debug-exit
echo "Mounting" echo "Mounting"
sudo rm /mnt/* -r sudo rm /tmp/zealtmp/* -r
sudo sync sudo sync
sudo modprobe nbd sudo modprobe nbd
sudo qemu-nbd -c dev/nbd0 -f raw ./ZealOS.raw sudo qemu-nbd -c dev/nbd0 -f raw ./ZealOS.raw
sudo partprobe /dev/nbd0 sudo partprobe /dev/nbd0
echo "Merging with src/" echo "Merging with src/"
sudo mount /dev/nbd0p1 /mnt sudo mount /dev/nbd0p1 /tmp/zealtmp
rm ../src/Home/Registry.CC # we use Registry for auto-iso process, don't want to overwrite rm ../src/Home/Registry.CC # we use Registry for auto-iso process, don't want to overwrite
rm ../src/Home/MakeHome.CC # unneeded file rm ../src/Home/MakeHome.CC # unneeded file
sudo cp -r ../src/* /mnt/ sudo cp -r ../src/* /tmp/zealtmp/
sudo sync sudo sync
echo "Files copied, unmounting" echo "Files copied, unmounting"
sudo umount /mnt sudo umount /tmp/zealtmp
sudo qemu-nbd -d /dev/nbd0 sudo qemu-nbd -d /dev/nbd0
sudo rm /mnt/* -r sudo rm /tmp/zealtmp/* -r
sudo sync sudo sync
qemu-system-x86_64 -machine q35,kernel_irqchip=off,accel=kvm -drive format=raw,file=ZealOS.raw -m 2G -smp $(nproc) -rtc base=localtime -device isa-debug-exit qemu-system-x86_64 -machine q35,kernel_irqchip=off,accel=kvm -drive format=raw,file=ZealOS.raw -m 2G -smp $(nproc) -rtc base=localtime -device isa-debug-exit
echo "Mounting" echo "Mounting"
sudo rm /mnt/* -r sudo rm /tmp/zealtmp/* -r
sudo sync sudo sync
sudo modprobe nbd sudo modprobe nbd
sudo qemu-nbd -c dev/nbd0 -f raw ./ZealOS.raw sudo qemu-nbd -c dev/nbd0 -f raw ./ZealOS.raw
sudo partprobe /dev/nbd0 sudo partprobe /dev/nbd0
sudo mount /dev/nbd0p1 /mnt sudo mount /dev/nbd0p1 /tmp/zealtmp
echo "Extracting Distro ISO" echo "Extracting Distro ISO"
sudo rm ./ZealOS-*.iso # comment this line if you want lingering old ISOs sudo rm ./ZealOS-*.iso # comment this line if you want lingering old ISOs
sudo cp /mnt/Tmp/MyDistro.ISO.C ./ZealOS-$(date +%Y-%m-%d-%H_%M_%S).iso sudo cp /tmp/zealtmp/Tmp/MyDistro.ISO.C ./ZealOS-$(date +%Y-%m-%d-%H_%M_%S).iso
sudo chown -R $USER:$USER ./ZealOS-*.iso sudo chown -R $USER:$USER ./ZealOS-*.iso
echo "Files copied, unmounting" echo "Files copied, unmounting"
sudo umount /mnt sudo umount /tmp/zealtmp
sudo qemu-nbd -d /dev/nbd0 sudo qemu-nbd -d /dev/nbd0
sudo rm /mnt/* -r sudo rm /tmp/zealtmp/* -r
sudo sync sudo sync
echo "Deleting temp HDD" echo "Deleting temp HDD"
rm ./ZealOS.raw rm ./ZealOS.raw

6
build/sync_repo.sh
View file

@ -14,15 +14,15 @@ exit # Comment this line out
# sudo qemu-nbd -c dev/nbd0 ZealOS.qcow2 # sudo qemu-nbd -c dev/nbd0 ZealOS.qcow2
sudo partprobe /dev/nbd0 sudo partprobe /dev/nbd0
sudo mount /dev/nbd0p1 /mnt sudo mount /dev/nbd0p1 /tmp/zealtmp
echo "removing src/ files" echo "removing src/ files"
rm -rf ../src/* rm -rf ../src/*
echo "copying src/ files from root of mounted hdd" echo "copying src/ files from root of mounted hdd"
sudo cp -r /mnt/* ../src/ sudo cp -r /tmp/zealtmp/* ../src/
sudo rm ../src/Boot/BootMHD2.BIN.C sudo rm ../src/Boot/BootMHD2.BIN.C
echo "src/ files copied" echo "src/ files copied"
echo "unmounting..." echo "unmounting..."
sudo umount /mnt sudo umount /tmp/zealtmp
sudo qemu-nbd -d /dev/nbd0 sudo qemu-nbd -d /dev/nbd0
echo "unmounted hdd" echo "unmounted hdd"
echo "set perms" echo "set perms"

8
build/sync_vm.sh
View file

@ -16,14 +16,14 @@ exit # Comment this line out
# sudo qemu-nbd -c dev/nbd0 ZealOS.qcow2 # sudo qemu-nbd -c dev/nbd0 ZealOS.qcow2
sudo partprobe /dev/nbd0 sudo partprobe /dev/nbd0
sudo mount /dev/nbd0p1 /mnt sudo mount /dev/nbd0p1 /tmp/zealtmp
echo "Merging with src/" echo "Merging with src/"
sudo cp -r ../src/* /mnt/ sudo cp -r ../src/* /tmp/zealtmp
sudo sync sudo sync
echo "Files copied, unmounting" echo "Files copied, unmounting"
sudo umount /mnt sudo umount /tmp/zealtmp
sudo qemu-nbd -d /dev/nbd0 sudo qemu-nbd -d /dev/nbd0
sudo rm /mnt/* -r sudo rm /tmp/zealtmp/* -r
sudo sync sudo sync
echo "finished." echo "finished."
git status git status