os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

kaleid is remade if there is an error

This commit is contained in:
Adrien Bourmault 2019-05-12 20:30:53 +02:00
parent c20ebe6ffc
commit 2623fc2d77
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -23,6 +23,7 @@
#=----------------------------------------------------------------------------=# #=----------------------------------------------------------------------------=#
.PHONY: all test test32 debug gdb install_mbr dust clean OS/K .PHONY: all test test32 debug gdb install_mbr dust clean OS/K
.DELETE_ON_ERROR: $(BINDIR)/kaleid
## VARIABLES ----------------------------------------------------------------- # ## VARIABLES ----------------------------------------------------------------- #

4
ProjectTree
View File

@ -255,8 +255,10 @@
├── AUTHORS ├── AUTHORS
├── ChangeLog ├── ChangeLog
├── COPYING ├── COPYING
├── kaleid32_disasm.asm
├── kaleid64_disasm.asm
├── Makefile ├── Makefile
├── ProjectTree ├── ProjectTree
└── README.md └── README.md
41 directories, 193 files 41 directories, 195 files

2
boot/grub/mount.sh
View File

@ -32,7 +32,7 @@ set -e #exit if error
echo ${CL2}[mount.sh]${NC} Mouting image... \(losetup\)${CL3} echo ${CL2}[mount.sh]${NC} Mouting image... \(losetup\)${CL3}
sudo losetup -D > /dev/null sudo losetup -D > /dev/null
sudo losetup /dev/loop0 $1 -o 1048576 /dev/null #mounting the logical partition sudo losetup /dev/loop0 $1 -o 1048576 > /dev/null #mounting the logical partition
echo ${CL2}[mount.sh]${NC} Mouting volume... \(mount\)${CL3} echo ${CL2}[mount.sh]${NC} Mouting volume... \(mount\)${CL3}
sudo mount -t vfat /dev/loop0 $2 -o rw,uid=$(id -u),gid=$(id -g) > /dev/null sudo mount -t vfat /dev/loop0 $2 -o rw,uid=$(id -u),gid=$(id -g) > /dev/null
echo ${CL2}[mount.sh]${CL} Terminated without error.${CL3} echo ${CL2}[mount.sh]${CL} Terminated without error.${CL3}