cleanup bootcore after it's done its job

2 files changed, 2 insertions, 18 deletions

diff --git a/iso32 b/iso32
index 139fbed..f7d721d 100755
--- a/iso32
+++ b/iso32
@@ -6,23 +6,16 @@ kernelconfig
 checkroot
 
 makeisox86 () {
-	# ISO layout
 	mkdir -p "$coremntx86"
 	mkdir -p "$isobootx86"
-	# Mount && Sync squashed core (Kogaion stage4) into live environment
 	mount -t squashfs "$chrootx86" "$coremntx86"
 	rsync -aHAXr --progress "$coremntx86/" "$livedirx86/"
-	# Put our kernel and initramfs in place
 	cp -avx ""$livedirx86"/boot/"$kernelnamex86"" ""$isonamex86"/boot/"$releasename""
 	cp -avx ""$livedirx86"/boot/"$ramfsnamex86"" ""$isonamex86"/boot/"$releasename".igz"
-	# Checksum the kernel && initramfs
 	sha256sum ""$isonamex86"/boot/"$releasename"" | tee ""$isonamex86"/boot/"$releasename".sha256"
 	sha256sum ""$isonamex86"/boot/"$releasename.igz"" | tee ""$isonamex86"/boot/"$releasename".igz.sha256"
-	# Squash live environment
 	mksquashfs "$livedirx86" ""$livedirx86".squashfs" -b 1048576 -comp xz -Xdict-size 100%
-	# Checksum the live environment
 	sha256sum ""$livedirx86".squashfs" | tee ""$livedirx86".squashfs.sha256"
-	# Enable liveboot
 	touch "$livedirx86"
 }
 
@@ -32,9 +25,8 @@ bootcorex86 () {
 }
 
 cleanupisox86 () {
-	# Remove live environment directory (we have it squashed now, no longer needed)
 	rm -rf "$livedirx86"
-	# Umount squashed core (Kogaion stage4)
+	rm -rf "$bootcorepath"
 	umount "$coremntx86"
 }
 
diff --git a/iso64 b/iso64
index 3594f0c..4ddd4ae 100755
--- a/iso64
+++ b/iso64
@@ -6,24 +6,17 @@ kernelconfig
 checkroot
 
 makeisox64 () {
-	# ISO layout
 	mkdir -p "$coremntx64"
 	mkdir -p "$isobootx64"
 	mkdir -p "$isoefibootx64"
-	# Mount && Sync squashed core (Kogaion stage4) into live environment
 	mount -t squashfs "$chrootx64" "$coremntx64"
 	rsync -aHAXr --progress "$coremntx64/" "$livedirx64/"
-	# Put our kernel and initramfs in place
 	cp -avx ""$livedirx64"/boot/"$kernelnamex64"" ""$isonamex64"/boot/"$releasename""
 	cp -avx ""$livedirx64"/boot/"$ramfsnamex64"" ""$isonamex64"/boot/"$releasename".igz"
-	# Checksum the kernel && initramfs
 	sha256sum ""$isonamex64"/boot/"$releasename"" | tee ""$isonamex64"/boot/"$releasename".sha256"
 	sha256sum ""$isonamex64"/boot/"$releasename.igz"" | tee ""$isonamex64"/boot/"$releasename".igz.sha256"
-	# Squash live environment
 	mksquashfs "$livedirx64" ""$livedirx64".squashfs" -b 1048576 -comp xz -Xdict-size 100%
-	# Checksum the live environment
 	sha256sum ""$livedirx64".squashfs" | tee ""$livedirx64".squashfs.sha256"
-	# Enable liveboot
 	touch "$livedirx64"
 }
 
@@ -33,9 +26,8 @@ bootcorex64 () {
 }
 
 cleanupisox64 () {
-	# Remove live environment directory (we have it squashed now, no longer needed)
 	rm -rf "$livedirx64"
-	# Umount squashed core (Kogaion stage4)
+	rm -rf "$bootcorepath"
 	umount "$coremntx64"
 }