diff options
| -rwxr-xr-x | libvasile | 84 |
1 files changed, 42 insertions, 42 deletions
@@ -250,34 +250,34 @@ chrootx86 () { # x64 specific iso functions isostartx64 () { - mount -o bind packages "$livedirx64"/usr/portage/packages - mount -o bind targets "$livedirx64"/mnt - mount -t proc proc "$livedirx64"/proc - mount -t sysfs sysfs "$livedirx64"/sys - mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$livedirx64"/dev - mount -t devpts -o nosuid,noexec,relatime,gid=5,mode=620 none "$livedirx64"/dev/pts - mount -t tmpfs -o nosuid,nodev none "$livedirx64"/dev/shm - mount -t tmpfs -o nosuid,nodev,noexec none "$livedirx64"/tmp + 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 } isostopx64 () { - umount -l "$livedirx64"/proc > /dev/null 2>&1 - umount -l "$livedirx64"/sys > /dev/null 2>&1 - umount -l "$livedirx64"/dev/pts > /dev/null 2>&1 - umount -l "$livedirx64"/dev/shm > /dev/null 2>&1 - umount -l "$livedirx64"/dev > /dev/null 2>&1 - umount -l "$livedirx64"/tmp > /dev/null 2>&1 - umount -l "$livedirx64"/usr/portage/packages > /dev/null 2>&1 - umount -l "$livedirx64"/mnt > /dev/null 2>&1 + 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 } isooverlaysx64 () { echo "injecting "$releasename" main overlay into x64 environment" sleep 1 - chroot "$livedirx64" su - "$isouser" -c "$isomainoverlay" + chroot "$syncdirx64" su - "$isouser" -c "$isomainoverlay" echo "injecting "$releasename" "$releasetarget" overlay into x64 environment" sleep 1 - chroot "$livedirx64" su - "$isouser" -c "$isoaddonoverlay" + chroot "$syncdirx64" su - "$isouser" -c "$isoaddonoverlay" } isobuildsystemx64 () { @@ -285,14 +285,14 @@ isobuildsystemx64 () { echo "" sleep 1 for cmd in "$isobuildgit" "$isoportageconfig" "$isomakeconfx64" "$isoprofile" "$isoenvupdate" ; do - chroot "$livedirx64" su - "$isouser" -c "$cmd" + chroot "$syncdirx64" su - "$isouser" -c "$cmd" done } isoramfsx64 () { echo "generating live initramfs" echo "" - chroot "$livedirx64" su - "$isouser" -c "$isoramfs" + chroot "$syncdirx64" 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 "$livedirx64" su - "$isouser" + chroot "$syncdirx64" su - "$isouser" } # x86 specific iso functions isostartx86 () { - mount -o bind packages "$livedirx86"/usr/portage/packages - mount -o bind targets "$livedirx86"/mnt - mount -t proc proc "$livedirx86"/proc - mount -t sysfs sysfs "$livedirx86"/sys - mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$livedirx86"/dev - mount -t devpts -o nosuid,noexec,relatime,gid=5,mode=620 none "$livedirx86"/dev/pts - mount -t tmpfs -o nosuid,nodev none "$livedirx86"/dev/shm - mount -t tmpfs -o nosuid,nodev,noexec none "$livedirx86"/tmp + 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 } isostopx86 () { - umount -l "$livedirx86"/proc > /dev/null 2>&1 - umount -l "$livedirx86"/sys > /dev/null 2>&1 - umount -l "$livedirx86"/dev/pts > /dev/null 2>&1 - umount -l "$livedirx86"/dev/shm > /dev/null 2>&1 - umount -l "$livedirx86"/dev > /dev/null 2>&1 - umount -l "$livedirx86"/tmp > /dev/null 2>&1 - umount -l "$livedirx86"/usr/portage/packages > /dev/null 2>&1 - umount -l "$livedirx86"/mnt > /dev/null 2>&1 + 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 } isooverlaysx86 () { echo "injecting "$releasename" main overlay into x86 environment" sleep 1 - linux32 chroot "$livedirx86" su - "$isouser" -c "$isomainoverlay" + linux32 chroot "$syncdirx86" su - "$isouser" -c "$isomainoverlay" echo "injecting "$releasename" "$releasetarget" overlay into x86 environment" sleep 1 - linux32 chroot "$livedirx86" su - "$isouser" -c "$isoaddonoverlay" + linux32 chroot "$syncdirx86" su - "$isouser" -c "$isoaddonoverlay" } isobuildsystemx86 () { @@ -342,14 +342,14 @@ isobuildsystemx86 () { echo "" sleep 1 for cmd in "$isobuildgit" "$isoportageconfig" "$isomakeconfx86" "$isoprofile" "$isoenvupdate" ; do - linux32 chroot "$livedirx86" su - "$isouser" -c "$cmd" + linux32 chroot "$syncdirx86" su - "$isouser" -c "$cmd" done } isoramfsx86 () { echo "generating live initramfs" echo "" - linux32 chroot "$livedirx86" su - "$isouser" -c "$isoramfs" + linux32 chroot "$syncdirx86" 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 "$livedirx86" su - "$isouser" + linux32 chroot "$syncdirx86" su - "$isouser" } |