summaryrefslogtreecommitdiff
path: root/libvasile
diff options
context:
space:
mode:
authorV3n3RiX <venerix@rogentos.ro>2016-01-01 22:20:18 +0000
committerV3n3RiX <venerix@rogentos.ro>2016-01-01 22:20:18 +0000
commita00808b8f4af9fc731d6d57ea5959c1dba7387f1 (patch)
treec543fadd651986a72cdf9b0427af1cb8c6e25e82 /libvasile
parente41251434a6c2bd0fa243666015510d72d16c15c (diff)
with new layout, we need a bit more sane variables
Diffstat (limited to 'libvasile')
-rwxr-xr-xlibvasile84
1 files changed, 42 insertions, 42 deletions
diff --git a/libvasile b/libvasile
index 4ba2cc8..bc3dd45 100755
--- a/libvasile
+++ b/libvasile
@@ -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"
}