From 2623fc2d77954bdeb645b1d96440c19c8f934319 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Sun, 12 May 2019 20:30:53 +0200 Subject: [PATCH] kaleid is remade if there is an error --- Makefile | 1 + ProjectTree | 4 +++- boot/grub/mount.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 71f7151..d4b39b3 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,7 @@ #=----------------------------------------------------------------------------=# .PHONY: all test test32 debug gdb install_mbr dust clean OS/K +.DELETE_ON_ERROR: $(BINDIR)/kaleid ## VARIABLES ----------------------------------------------------------------- # diff --git a/ProjectTree b/ProjectTree index cd1f48c..331ca77 100644 --- a/ProjectTree +++ b/ProjectTree @@ -255,8 +255,10 @@ ├── AUTHORS ├── ChangeLog ├── COPYING +├── kaleid32_disasm.asm +├── kaleid64_disasm.asm ├── Makefile ├── ProjectTree └── README.md -41 directories, 193 files +41 directories, 195 files diff --git a/boot/grub/mount.sh b/boot/grub/mount.sh index a880f03..3a49e03 100755 --- a/boot/grub/mount.sh +++ b/boot/grub/mount.sh @@ -32,7 +32,7 @@ set -e #exit if error echo ${CL2}[mount.sh]${NC} Mouting image... \(losetup\)${CL3} 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} 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}