From 7356b72715b9009dcc299ab73aed3340a4f24c73 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Jan 2016 22:45:38 +0000 Subject: double squash our live environment, put it in place for dmsquash-live to detect it --- iso32 | 7 +++++++ iso64 | 7 +++++++ vasile | 2 ++ 3 files changed, 16 insertions(+) diff --git a/iso32 b/iso32 index 8be8f6d..cd01cf8 100755 --- a/iso32 +++ b/iso32 @@ -9,6 +9,7 @@ makeisox86 () { # create live iso layout mkdir -p "$isostagingdirx86" mkdir -p "$isobootdirx86" + mkdir -p "$isoliveosdirx86" mkdir -p "$isosupersquashdirx86" # mount && copy our core stage 4 image mount -t squashfs "$chrootx86" "$isostagingdirx86" @@ -24,6 +25,12 @@ makeisox86 () { # squash live environment mksquashfs "$isosyncdirx86" ""$isosyncdirx86".img" -b 1048576 -comp xz -Xdict-size 100% sha256sum ""$isosyncdirx86".img" | tee ""$isosyncdirx86".img.sha256" + # move our squashed live environment on place + mv ""$isosyncdirx86".img" "$isosupersquashdirx86" + # squash it again to be detected by dmsquash-live + mksquashfs "$isosupersquashdirx86" "squashfs.img" + # and again, move our double squashed live environment on place + mv "squashfs.img" "$isoliveosdirx86" } bootcorex86 () { diff --git a/iso64 b/iso64 index acac387..d44879d 100755 --- a/iso64 +++ b/iso64 @@ -10,6 +10,7 @@ makeisox64 () { mkdir -p "$isostagingdirx64" mkdir -p "$isobootdirx64" mkdir -p "$isoefibootdirx64" + mkdir -p "$isoliveosdirx64" mkdir -p "$isosupersquashdirx64" # mount && copy our core stage 4 image mount -t squashfs "$chrootx64" "$isostagingdirx64" @@ -25,6 +26,12 @@ makeisox64 () { # squash live environment mksquashfs "$isosyncdirx64" ""$isosyncdirx64".img" -b 1048576 -comp xz -Xdict-size 100% sha256sum ""$isosyncdirx64".img" | tee ""$isosyncdirx64".img.sha256" + # move our squashed live environment on place + mv ""$isosyncdirx64".img" "$isosupersquashdirx64" + # squash it again to be detected by dmsquash-live + mksquashfs "$isosupersquashdirx64" "squashfs.img" + # and again, move our double squashed live environment on place + mv "squashfs.img" "$isoliveosdirx64" } bootcorex64 () { diff --git a/vasile b/vasile index 0afa9a6..5078d96 100755 --- a/vasile +++ b/vasile @@ -63,6 +63,7 @@ export local isorootdirx64=""$releasename"-"$releasetarget"-"$releaseversion"-"$ export local isokernelnamex64="kernel-genkernel-"$isomainarchx64"-"$kernelver"" export local isostagingdirx64="/tmp/"$isorootdirx64"" export local isosupersquashdirx64=""$isorootdirx64"/CDroot/LiveOS" +export local isoliveosdirx64=""$isorootdirx64"/LiveOS" export local isosyncdirx64=""$isorootdirx64"/rootfs" export local isobootdirx64=""$isorootdirx64"/boot/grub" export local isoefibootdirx64=""$isorootdirx64"/efi/boot" @@ -75,6 +76,7 @@ export local isorootdirx86=""$releasename"-"$releasetarget"-"$releaseversion"-"$ export local isokernelnamex86="kernel-genkernel-"$isomainarchx86"-"$kernelver"" export local isostagingdirx86="/tmp/"$isorootdirx86"" export local isosupersquashdirx86=""$isorootdirx86"/CDroot/LiveOS" +export local isoliveosdirx86=""$isorootdirx86"/LiveOS" export local isosyncdirx86=""$isorootdirx86"/rootfs" export local isobootdirx86=""$isorootdirx86"/boot/grub" -- cgit v1.2.3