minor fix for double squashed live env

3 files changed, 12 insertions, 6 deletions

diff --git a/iso32 b/iso32
index cd01cf8..5e764f7 100755
--- a/iso32
+++ b/iso32
@@ -11,6 +11,7 @@ makeisox86 () {
 	mkdir -p "$isobootdirx86"
 	mkdir -p "$isoliveosdirx86"
 	mkdir -p "$isosupersquashdirx86"
+	mkdir -p "$isolivesqfsdirx86"
 	# mount && copy our core stage 4 image
 	mount -t squashfs "$chrootx86" "$isostagingdirx86"
 	rsync -aHAXr --progress "$isostagingx86/" "$isosyncdirx86/"
@@ -28,9 +29,9 @@ makeisox86 () {
 	# move our squashed live environment on place
 	mv ""$isosyncdirx86".img"  "$isosupersquashdirx86"
 	# squash it again to be detected by dmsquash-live
-	mksquashfs "$isosupersquashdirx86" "squashfs.img"
+	mksquashfs "$isosupersquashdirx86" ""$isorootdirx86"/squashfs.img"
 	# and again, move our double squashed live environment on place
-	mv "squashfs.img" "$isoliveosdirx86"
+	mv ""$isorootdirx86"/squashfs.img" "$isoliveosdirx86"
 }
 
 bootcorex86 () {
@@ -42,6 +43,7 @@ bootcorex86 () {
 cleanupisox86 () {
 	rm -rf "$isosyncdirx86"
 	rm -rf "$bootcorepath"
+	rm -rf "$isosupersquashdirx86"
 	umount "$isostagingdirx86"
 }
 
diff --git a/iso64 b/iso64
index d44879d..531fdba 100755
--- a/iso64
+++ b/iso64
@@ -12,6 +12,7 @@ makeisox64 () {
 	mkdir -p "$isoefibootdirx64"
 	mkdir -p "$isoliveosdirx64"
 	mkdir -p "$isosupersquashdirx64"
+	mkdir -p "$isolivesqfsdirx64"
 	# mount && copy our core stage 4 image
 	mount -t squashfs "$chrootx64" "$isostagingdirx64"
 	rsync -aHAXr --progress "$isostagingdirx64/" "$isosyncdirx64/"
@@ -29,9 +30,9 @@ makeisox64 () {
 	# move our squashed live environment on place
 	mv ""$isosyncdirx64".img"  "$isosupersquashdirx64"
 	# squash it again to be detected by dmsquash-live
-	mksquashfs "$isosupersquashdirx64" "squashfs.img"
+	mksquashfs "$isosupersquashdirx64" ""$isorootdirx64"/squashfs.img"
 	# and again, move our double squashed live environment on place
-	mv "squashfs.img" "$isoliveosdirx64"
+	mv ""$isorootdirx64/"squashfs.img" "$isoliveosdirx64"
 }
 
 bootcorex64 () {
@@ -42,6 +43,7 @@ bootcorex64 () {
 
 cleanupisox64 () {
 	rm -rf "$isosyncdirx64"
+	rm -rf "$isosupersquashdirx64"
 	rm -rf "$bootcorepath"
 	umount "$isostagingdirx64"
 }
diff --git a/vasile b/vasile
index 5078d96..ada054b 100755
--- a/vasile
+++ b/vasile
@@ -62,7 +62,8 @@ export local isomakeconfx64="ln -sf /opt/"$releasename"-build/conf/intel/portage
 export local isorootdirx64=""$releasename"-"$releasetarget"-"$releaseversion"-"$isomainarchx64""
 export local isokernelnamex64="kernel-genkernel-"$isomainarchx64"-"$kernelver""
 export local isostagingdirx64="/tmp/"$isorootdirx64""
-export local isosupersquashdirx64=""$isorootdirx64"/CDroot/LiveOS"
+export local isosupersquashdirx64=""$isorootdirx64"/CDroot"
+export local isolivesqfsdirx64=""$isosupersquashdirx64"/LiveOS"
 export local isoliveosdirx64=""$isorootdirx64"/LiveOS"
 export local isosyncdirx64=""$isorootdirx64"/rootfs"
 export local isobootdirx64=""$isorootdirx64"/boot/grub"
@@ -75,7 +76,8 @@ export local isomakeconfx86="ln -sf /opt/"$releasename"-build/conf/intel/portage
 export local isorootdirx86=""$releasename"-"$releasetarget"-"$releaseversion"-"$isomainarchx86""
 export local isokernelnamex86="kernel-genkernel-"$isomainarchx86"-"$kernelver""
 export local isostagingdirx86="/tmp/"$isorootdirx86""
-export local isosupersquashdirx86=""$isorootdirx86"/CDroot/LiveOS"
+export local isosupersquashdirx86=""$isorootdirx86"/CDroot"
+export local isolivesqfsdirx86=""$isosupersquashdirx86"/LiveOS"
 export local isoliveosdirx86=""$isorootdirx86"/LiveOS"
 export local isosyncdirx86=""$isorootdirx86"/rootfs"
 export local isobootdirx86=""$isorootdirx86"/boot/grub"