summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xiso3214
-rwxr-xr-xiso6414
2 files changed, 14 insertions, 14 deletions
diff --git a/iso32 b/iso32
index 8c83afc..6f20cd1 100755
--- a/iso32
+++ b/iso32
@@ -18,21 +18,21 @@ makeisox86 () {
mkdir -p "$isoboot"
# Mount && Sync squashed core (Kogaion stage4) into live environment
mount -t squashfs "$chrootx86" "$coremnt"
- rsync -aHAXr --progress "$coremnt/" ""$isoname"/livecd/"
+ rsync -aHAXr --progress "$coremnt/" "$livedir/"
# Put our kernel and initramfs in place
- cp -avx ""$isoname"/livecd/boot/"$kernelname"" ""$isoname"/boot/"$releasename""
- cp -avx ""$isoname"/livecd/boot/"$ramfsname"" ""$isoname"/boot/"$releasename".igz"
+ cp -avx ""$livedir"/boot/"$kernelname"" ""$isoname"/boot/"$releasename""
+ cp -avx ""$livedir"/boot/"$ramfsname"" ""$isoname"/boot/"$releasename".igz"
# Checksum the kernel && initramfs
sha256sum ""$isoname"/boot/"$releasename"" | tee ""$isoname"/boot/"$releasename".sha256"
sha256sum ""$isoname"/boot/"$releasename.igz"" | tee ""$isoname"/boot/"$releasename".igz.sha256"
# Squash live environment
- mksquashfs ""$isoname"/livecd" ""$isoname"/livecd.squashfs" -b 1048576 -comp xz -Xdict-size 100%
+ mksquashfs "$livedir" ""$livedir".squashfs" -b 1048576 -comp xz -Xdict-size 100%
# Checksum the live environment
- sha256sum ""$isoname"/livecd.squashfs" | tee ""$isoname"/livecd.squashfs.sha256"
+ sha256sum ""$livedir".squashfs" | tee ""$livedir".squashfs.sha256"
# Remove live environment directory (we have it squashed now, no longer needed)
- rm -rf ""$isoname"/livecd"
+ rm -rf "$livedir"
# Enable liveboot
- touch ""$isoname"/livecd"
+ touch "$livedir"
# Umount squashed core (Kogaion stage4)
umount "$coremnt"
}
diff --git a/iso64 b/iso64
index 30cfb04..7401d6d 100755
--- a/iso64
+++ b/iso64
@@ -20,21 +20,21 @@ makeisox64 () {
mkdir -p "$isoefiboot"
# Mount && Sync squashed core (Kogaion stage4) into live environment
mount -t squashfs "$chrootx64" "$coremnt"
- rsync -aHAXr --progress "$coremnt/" ""$isoname"/livecd/"
+ rsync -aHAXr --progress "$coremnt/" "$livedir/"
# Put our kernel and initramfs in place
- cp -avx ""$isoname"/livecd/boot/"$kernelname"" ""$isoname"/boot/"$releasename""
- cp -avx ""$isoname"/livecd/boot/"$ramfsname"" ""$isoname"/boot/"$releasename".igz"
+ cp -avx ""$livedir"/boot/"$kernelname"" ""$isoname"/boot/"$releasename""
+ cp -avx ""$livedir"/boot/"$ramfsname"" ""$isoname"/boot/"$releasename".igz"
# Checksum the kernel && initramfs
sha256sum ""$isoname"/boot/"$releasename"" | tee ""$isoname"/boot/"$releasename".sha256"
sha256sum ""$isoname"/boot/"$releasename.igz"" | tee ""$isoname"/boot/"$releasename".igz.sha256"
# Squash live environment
- mksquashfs ""$isoname"/livecd" ""$isoname"/livecd.squashfs" -b 1048576 -comp xz -Xdict-size 100%
+ mksquashfs "$livedir" ""$livedir".squashfs" -b 1048576 -comp xz -Xdict-size 100%
# Checksum the live environment
- sha256sum ""$isoname"/livecd.squashfs" | tee ""$isoname"/livecd.squashfs.sha256"
+ sha256sum ""$livedir".squashfs" | tee ""$livedir".squashfs.sha256"
# Remove live environment directory (we have it squashed now, no longer needed)
- rm -rf ""$isoname"/livecd"
+ rm -rf "$livedir"
# Enable liveboot
- touch ""$isoname"/livecd"
+ touch "$livedir"
# Umount squashed core (Kogaion stage4)
umount "$coremnt"
}