diff options
| -rwxr-xr-x | iso32 | 26 | ||||
| -rwxr-xr-x | iso64 | 30 | ||||
| -rwxr-xr-x | libvasile | 84 | ||||
| -rwxr-xr-x | vasile | 32 |
4 files changed, 85 insertions, 87 deletions
@@ -7,16 +7,14 @@ checkroot makeisox86 () { # create live iso layout - mkdir -p "$coremntx86" - mkdir -p "$isobootx86" - mkdir -p "$liverootfsx86" + mkdir -p "$isostagingdirx86" + mkdir -p "$isobootdirx86" + mkdir -p "$isosupersquashdirx86" # mount && copy our core stage 4 image - mount -t squashfs "$chrootx86" "$coremntx86" - rsync -aHAXr --progress "$coremntx86/" "$syncdirx86/" - cp -avx ""$syncdirx86"/boot/"$kernelnamex86"" ""$isonamex86"/boot/vmlinuz" - cp -avx ""$syncdirx86"/boot/"$ramfsnamex86"" ""$isonamex86"/boot/initrd" - sha256sum ""$isonamex86"/boot/vmlinuz" | tee ""$isonamex86"/boot/vmlinuz.sha256" - sha256sum ""$isonamex86"/boot/initrd" | tee ""$isonamex86"/boot/initrd.sha256" + mount -t squashfs "$chrootx86" "$isostagingdirx86" + rsync -aHAXr --progress "$isostagingx86/" "$isosyncdirx86/" + cp -avx ""$isosyncdirx86"/boot/"$isokernelnamex86"" ""$isorootdirx86"/boot/vmlinuz" + sha256sum ""$isorootdirx86"/boot/vmlinuz" | tee ""$isorootdirx86"/boot/vmlinuz.sha256" # configure portage && give up control for package / desktop environment installation isostartx86 isooverlaysx86 @@ -24,20 +22,20 @@ makeisox86 () { isochrootx86 isostopx86 # squash live environment - mksquashfs "$syncdirx86" ""$syncdirx86".img" -b 1048576 -comp xz -Xdict-size 100% - sha256sum ""$syncdirx86".img" | tee ""$syncdirx86".img.sha256" + mksquashfs "$isosyncdirx86" ""$isosyncdirx86".img" -b 1048576 -comp xz -Xdict-size 100% + sha256sum ""$isosyncdirx86".img" | tee ""$isosyncdirx86".img.sha256" } bootcorex86 () { # configure live bootloader git clone https://gitlab.com/rogentos/boot-core.git "$bootcorepath" - cp -avx "$bootcorefiles" "$isonamex86" + cp -avx "$bootcorefiles" "$isorootdirx86" } cleanupisox86 () { - rm -rf "$syncdirx86" + rm -rf "$isosyncdirx86" rm -rf "$bootcorepath" - umount "$coremntx86" + umount "$isostagingdirx86" } main () { @@ -7,18 +7,18 @@ checkroot makeisox64 () { # create live iso layout - mkdir -p "$coremntx64" - mkdir -p "$isobootx64" - mkdir -p "$isoefibootx64" - mkdir -p "$liverootfsx64" + mkdir -p "$isostagingdirx64" + mkdir -p "$isobootdirx64" + mkdir -p "$isoefibootdirx64" + mkdir -p "$isosupersquashdirx64" # mount && copy our core stage 4 image - mount -t squashfs "$chrootx64" "$coremntx64" - rsync -aHAXr --progress "$coremntx64/" "$syncdirx64/" + mount -t squashfs "$chrootx64" "$isostagingx64" + rsync -aHAXr --progress "$isostagingdirx64/" "$isosyncdirx64/" # copy our kernel - cp -avx ""$syncdirx64"/boot/"$kernelnamex64"" ""$isonamex64"/boot/vmlinuz" - cp -avx ""$syncdirx64"/boot/"$ramfsnamex64"" ""$isonamex64"/boot/initrd" - sha256sum ""$isonamex64"/boot/vmlinuz" | tee ""$isonamex64"/boot/vmlinuz.sha256" - sha256sum ""$isonamex64"/boot/initrd" | tee ""$isonamex64"/boot/initrd.sha256" + cp -avx ""$isosyncdirx64"/boot/"$isokernelnamex64"" ""$isorootdirx64"/boot/vmlinuz" + cp -avx ""$isosyncdirx64"/boot/"$isoramfsname"" ""$isorootdirx64"/boot/initrd" + sha256sum ""$isorootdirx64"/boot/vmlinuz" | tee ""$isorootdirx64"/boot/vmlinuz.sha256" + sha256sum ""$isorootdirx64"/boot/initrd" | tee ""$isorootdirx64"/boot/initrd.sha256" # configure portage && give up control for package / desktop environment installation isostartx64 isooverlaysx64 @@ -26,20 +26,20 @@ makeisox64 () { isochrootx64 isostopx64 # squash live environment - mksquashfs "$syncdirx64" ""$syncdirx64".img" -b 1048576 -comp xz -Xdict-size 100% - sha256sum ""$syncdirx64".img" | tee ""$syncdirx64".img.sha256" + mksquashfs "$isosyncdirx64" ""$isosyncdirx64".img" -b 1048576 -comp xz -Xdict-size 100% + sha256sum ""$isosyncdirx64".img" | tee ""$isosyncdirx64".img.sha256" } bootcorex64 () { # configure live bootloader git clone https://gitlab.com/rogentos/boot-core.git "$bootcorepath" - cp -avx "$bootcorefiles" "$isonamex64" + cp -avx "$bootcorefiles" "$isorootdirx64" } cleanupisox64 () { - rm -rf "$syncdirx64" + rm -rf "$isosyncdirx64" rm -rf "$bootcorepath" - umount "$coremntx64" + umount "$isostagingdirx64" } main () { @@ -250,34 +250,34 @@ chrootx86 () { # x64 specific iso functions isostartx64 () { - mount -o bind packages "$syncdirx64"/usr/portage/packages - mount -o bind targets "$syncdirx64"/mnt - mount -t proc proc "$syncdirx64"/proc - mount -t sysfs sysfs "$syncdirx64"/sys - mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$syncdirx64"/dev - mount -t devpts -o nosuid,noexec,relatime,gid=5,mode=620 none "$syncdirx64"/dev/pts - mount -t tmpfs -o nosuid,nodev none "$syncdirx64"/dev/shm - mount -t tmpfs -o nosuid,nodev,noexec none "$syncdirx64"/tmp + mount -o bind packages "$isosyncdirx64"/usr/portage/packages + mount -o bind targets "$isosyncdirx64"/mnt + mount -t proc proc "$isosyncdirx64"/proc + mount -t sysfs sysfs "$isosyncdirx64"/sys + mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$isosyncdirx64"/dev + mount -t devpts -o nosuid,noexec,relatime,gid=5,mode=620 none "$isosyncdirx64"/dev/pts + mount -t tmpfs -o nosuid,nodev none "$isosyncdirx64"/dev/shm + mount -t tmpfs -o nosuid,nodev,noexec none "$isosyncdirx64"/tmp } isostopx64 () { - umount -l "$syncdirx64"/proc > /dev/null 2>&1 - umount -l "$syncdirx64"/sys > /dev/null 2>&1 - umount -l "$syncdirx64"/dev/pts > /dev/null 2>&1 - umount -l "$syncdirx64"/dev/shm > /dev/null 2>&1 - umount -l "$syncdirx64"/dev > /dev/null 2>&1 - umount -l "$syncdirx64"/tmp > /dev/null 2>&1 - umount -l "$syncdirx64"/usr/portage/packages > /dev/null 2>&1 - umount -l "$syncdirx64"/mnt > /dev/null 2>&1 + umount -l "$isosyncdirx64"/proc > /dev/null 2>&1 + umount -l "$isosyncdirx64"/sys > /dev/null 2>&1 + umount -l "$isosyncdirx64"/dev/pts > /dev/null 2>&1 + umount -l "$isosyncdirx64"/dev/shm > /dev/null 2>&1 + umount -l "$isosyncdirx64"/dev > /dev/null 2>&1 + umount -l "$isosyncdirx64"/tmp > /dev/null 2>&1 + umount -l "$isosyncdirx64"/usr/portage/packages > /dev/null 2>&1 + umount -l "$isosyncdirx64"/mnt > /dev/null 2>&1 } isooverlaysx64 () { echo "injecting "$releasename" main overlay into x64 environment" sleep 1 - chroot "$syncdirx64" su - "$isouser" -c "$isomainoverlay" + chroot "$isosyncdirx64" su - "$isouser" -c "$isomainoverlay" echo "injecting "$releasename" "$releasetarget" overlay into x64 environment" sleep 1 - chroot "$syncdirx64" su - "$isouser" -c "$isoaddonoverlay" + chroot "$isosyncdirx64" su - "$isouser" -c "$isoaddonoverlay" } isobuildsystemx64 () { @@ -285,14 +285,14 @@ isobuildsystemx64 () { echo "" sleep 1 for cmd in "$isobuildgit" "$isoportageconfig" "$isomakeconfx64" "$isoprofile" "$isoenvupdate" ; do - chroot "$syncdirx64" su - "$isouser" -c "$cmd" + chroot "$isosyncdirx64" su - "$isouser" -c "$cmd" done } isoramfsx64 () { echo "generating live initramfs" echo "" - chroot "$syncdirx64" su - "$isouser" -c "$isoramfs" + chroot "$isosyncdirx64" su - "$isouser" -c "$isoramfs" } isochrootx64 () { @@ -301,40 +301,40 @@ isochrootx64 () { echo -e "INSTALL APPS & TARGETS & DES YOU WANT INSIDE ISO" echo -e "EXIT WHEN YOU'RE DONE AND I'LL CREATE THE IMAGE" echo -e "" - chroot "$syncdirx64" su - "$isouser" + chroot "$isosyncdirx64" su - "$isouser" } # x86 specific iso functions isostartx86 () { - mount -o bind packages "$syncdirx86"/usr/portage/packages - mount -o bind targets "$syncdirx86"/mnt - mount -t proc proc "$syncdirx86"/proc - mount -t sysfs sysfs "$syncdirx86"/sys - mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$syncdirx86"/dev - mount -t devpts -o nosuid,noexec,relatime,gid=5,mode=620 none "$syncdirx86"/dev/pts - mount -t tmpfs -o nosuid,nodev none "$syncdirx86"/dev/shm - mount -t tmpfs -o nosuid,nodev,noexec none "$syncdirx86"/tmp + mount -o bind packages "$isosyncdirx86"/usr/portage/packages + mount -o bind targets "$isosyncdirx86"/mnt + mount -t proc proc "$isosyncdirx86"/proc + mount -t sysfs sysfs "$isosyncdirx86"/sys + mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$isosyncdirx86"/dev + mount -t devpts -o nosuid,noexec,relatime,gid=5,mode=620 none "$isosyncdirx86"/dev/pts + mount -t tmpfs -o nosuid,nodev none "$isosyncdirx86"/dev/shm + mount -t tmpfs -o nosuid,nodev,noexec none "$isosyncdirx86"/tmp } isostopx86 () { - umount -l "$syncdirx86"/proc > /dev/null 2>&1 - umount -l "$syncdirx86"/sys > /dev/null 2>&1 - umount -l "$syncdirx86"/dev/pts > /dev/null 2>&1 - umount -l "$syncdirx86"/dev/shm > /dev/null 2>&1 - umount -l "$syncdirx86"/dev > /dev/null 2>&1 - umount -l "$syncdirx86"/tmp > /dev/null 2>&1 - umount -l "$syncdirx86"/usr/portage/packages > /dev/null 2>&1 - umount -l "$syncdirx86"/mnt > /dev/null 2>&1 + umount -l "$isosyncdirx86"/proc > /dev/null 2>&1 + umount -l "$isosyncdirx86"/sys > /dev/null 2>&1 + umount -l "$isosyncdirx86"/dev/pts > /dev/null 2>&1 + umount -l "$isosyncdirx86"/dev/shm > /dev/null 2>&1 + umount -l "$isosyncdirx86"/dev > /dev/null 2>&1 + umount -l "$isosyncdirx86"/tmp > /dev/null 2>&1 + umount -l "$isosyncdirx86"/usr/portage/packages > /dev/null 2>&1 + umount -l "$isosyncdirx86"/mnt > /dev/null 2>&1 } isooverlaysx86 () { echo "injecting "$releasename" main overlay into x86 environment" sleep 1 - linux32 chroot "$syncdirx86" su - "$isouser" -c "$isomainoverlay" + linux32 chroot "$isosyncdirx86" su - "$isouser" -c "$isomainoverlay" echo "injecting "$releasename" "$releasetarget" overlay into x86 environment" sleep 1 - linux32 chroot "$syncdirx86" su - "$isouser" -c "$isoaddonoverlay" + linux32 chroot "$isosyncdirx86" su - "$isouser" -c "$isoaddonoverlay" } isobuildsystemx86 () { @@ -342,14 +342,14 @@ isobuildsystemx86 () { echo "" sleep 1 for cmd in "$isobuildgit" "$isoportageconfig" "$isomakeconfx86" "$isoprofile" "$isoenvupdate" ; do - linux32 chroot "$syncdirx86" su - "$isouser" -c "$cmd" + linux32 chroot "$isosyncdirx86" su - "$isouser" -c "$cmd" done } isoramfsx86 () { echo "generating live initramfs" echo "" - linux32 chroot "$syncdirx86" su - "$isouser" -c "$isoramfs" + linux32 chroot "$isosyncdirx86" su - "$isouser" -c "$isoramfs" } isochrootx86 () { @@ -358,5 +358,5 @@ isochrootx86 () { echo -e "INSTALL APPS & TARGETS & DES YOU WANT INSIDE ISO" echo -e "EXIT WHEN YOU'RE DONE AND I'LL CREATE THE IMAGE" echo -e "" - linux32 chroot "$syncdirx86" su - "$isouser" + linux32 chroot "$isosyncdirx86" su - "$isouser" } @@ -41,7 +41,7 @@ export local isoportageconfig="ln -sf /opt/"$releasename"-build/conf/intel/porta export local isoenvupdate="/usr/sbin/env-update && . /etc/profile" export local isoprofile="eselect profile set 1" export local isoramfs="dracut --no-hostonly --add "dmsquash-live pollcdrom" --kver "$kernelver"" -export local ramfsname="initramfs-"$kernelver".img" +export local isoramfsname="initramfs-"$kernelver".img" # x64 specific build variables @@ -57,26 +57,26 @@ export local chrootmakeconfx86="ln -sf /opt/"$releasename"-build/conf/intel/port # x64 specific iso variables -export local mainarchx64="x86_64" +export local isomainarchx64="x86_64" export local isomakeconfx64="ln -sf /opt/"$releasename"-build/conf/intel/portage/make.conf.amd64 /etc/portage/make.conf" -export local isonamex64=""$releasename"-"$releasetarget"-"$releaseversion"-"$mainarchx64"" -export local kernelnamex64="kernel-genkernel-"$mainarchx64"-"$kernelver"" -export local coremntx64="/tmp/"$isonamex64"" -export local liverootfsx64=""$isonamex64"/CDroot/LiveOS" -export local syncdirx64=""$isonamex64"/rootfs" -export local isobootx64=""$isonamex64"/boot/grub" -export local isoefibootx64=""$isonamex64"/efi/boot" +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 isosyncdirx64=""$isorootdirx64"/rootfs" +export local isobootdirx64=""$isorootdirx64"/boot/grub" +export local isoefibootdirx64=""$isorootdirx64"/efi/boot" # x86 specific iso variables -export local mainarchx86="x86" +export local isomainarchx86="x86" export local isomakeconfx86="ln -sf /opt/"$releasename"-build/conf/intel/portage/make.conf.x86 /etc/portage/make.conf" -export local isonamex86=""$releasename"-"$releasetarget"-"$releaseversion"-"$mainarchx86"" -export local kernelnamex86="kernel-genkernel-"$mainarchx86"-"$kernelver"" -export local coremntx86="/tmp/"$isonamex86"" -export local liverootfsx86=""$isonamex86"/CDroot/LiveOS" -export local syncdirx86=""$isonamex86"/rootfs" -export local isobootx86=""$isonamex86"/boot/grub" +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 isosyncdirx86=""$isorootdirx86"/rootfs" +export local isobootdirx86=""$isorootdirx86"/boot/grub" source /usr/lib/vasile/libvasile |