put the kernel and ramfs into place for live environment

2 files changed, 32 insertions, 10 deletions

diff --git a/iso32 b/iso32
index 77bf086..cd5f101 100755
--- a/iso32
+++ b/iso32
@@ -5,16 +5,27 @@
 kernelconfig
 checkroot
 
-export local isoarch="x86"
+export local mainarch="x86"
 export local isoname=""$releasename"-"$releaseversion"-"$isoarch""
-export local tmpiso="/tmp/"$isoname""
+export local coremnt="/tmp/"$isoname""
+export local kernelver="3.14.0-"$releasename""
+export local kernelname="kernel-genkernel-"$mainarch"-"$kernelver""
+export local ramfsname="initramfs-genkernel-"$mainarch"-"$kernelver""
 
 makeisox86 () {
+	# ISO layout
 	mkdir -p "$tmpiso"
 	mkdir -p ""$isoname"/livecd"
-	mount -t squashfs "$chrootx86" "$tmpiso"
-	rsync -aHAXr --progress "$tmpiso/" ""$isoname"/livecd/"
-	umount "$tmpiso"
+	mkdir -p ""$isoname"/boot"
+	# Mount && Sync squashed core (Kogaion stage4) into live environment
+	mount -t squashfs "$chrootx86" "$coremnt"
+	rsync -aHAXr --progress "$coremnt/" ""$isoname"/livecd/"
+	# Put our kernel and initramfs in place
+	cp -avx ""$isoname"/livecd/boot/"$kernelname"" "$isoname/"
+	cp -avx ""$isoname"/livecd/boot/"$ramfsname"" "$isoname/"
+	# Squash live environment
+	mksquashfs ""$isoname"/livecd" ""$isoname"/livecd.squashfs" -b 1048576 -comp xz -Xdict-size 100%
+	umount "$coremnt"
 }
 
 main () {
diff --git a/iso64 b/iso64
index 9280ecd..3e5ebf5 100755
--- a/iso64
+++ b/iso64
@@ -5,16 +5,27 @@
 kernelconfig
 checkroot
 
-export local isoarch="amd64"
+export local mainarch="x86_64"
 export local isoname=""$releasename"-"$releaseversion"-"$isoarch""
-export local tmpiso="/tmp/"$isoname""
+export local coremnt="/tmp/"$isoname""
+export local kernelver="3.14.0-"$releasename""
+export local kernelname="kernel-genkernel-"$mainarch"-"$kernelver""
+export local ramfsname="initramfs-genkernel-"$mainarch"-"$kernelver""
 
 makeisox64 () {
+	# ISO layout
 	mkdir -p "$tmpiso"
 	mkdir -p ""$isoname"/livecd"
-	mount -t squashfs "$chrootx64" "$tmpiso"
-	rsync -aHAXr --progress "$tmpiso/" ""$isoname"/livecd/"
-	umount "$tmpiso"
+	mkdir -p ""$isoname"/boot"
+	# Mount && Sync squashed core (Kogaion stage4) into live environment
+	mount -t squashfs "$chrootx64" "$coremnt"
+	rsync -aHAXr --progress "$coremnt/" ""$isoname"/livecd/"
+	# Put our kernel and initramfs in place
+	cp -avx ""$isoname"/livecd/boot/"$kernelname"" "$isoname/"
+	cp -avx ""$isoname"/livecd/boot/"$ramfsname"" "$isoname/"
+	# Squash live environment
+	mksquashfs ""$isoname"/livecd" ""$isoname"/livecd.squashfs" -b 1048576 -comp xz -Xdict-size 100%
+	umount "$coremnt"
 }
 
 main () {