Revert "drop targets, use portage sets instead"

This reverts commit 568ecfdad37ead262c4d1868271982e274375e6d.

1 files changed, 12 insertions, 26 deletions

diff --git a/libvasile b/libvasile
index 02dddcd..f591776 100755
--- a/libvasile
+++ b/libvasile
@@ -1,7 +1,7 @@
 # generic arch independent functions (used for both build && iso creation)
 
 kernelconfig () {
-	if [[ $(zgrep 'CONFIG_OVERLAYFS_FS=' /proc/config.gz) && $(zgrep "CONFIG_SQUASHFS=" /proc/config.gz) &&  $(zgrep "CONFIG_BLK_DEV_LOOP=" /proc/config.gz) ]] ; then
+	if [[ $(zgrep 'CONFIG_OVERLAY_FS=' /proc/config.gz) && $(zgrep "CONFIG_SQUASHFS=" /proc/config.gz) &&  $(zgrep "CONFIG_BLK_DEV_LOOP=" /proc/config.gz) ]] ; then
 		echo ""
 		echo "Kernel configuration seems OK, moving on"
 		echo ""
@@ -78,7 +78,7 @@ chrootstop () {
 	umount -l "$overlaydir"/dev > /dev/null 2>&1
 	umount -l "$overlaydir"/tmp > /dev/null 2>&1
 	umount -l "$overlaydir"/usr/portage/packages > /dev/null 2>&1
-	umount -l "$overlaydir"/var/lib/portage > /dev/null 2>&1
+	umount -l "$overlaydir"/mnt > /dev/null 2>&1
 	umount -l "$overlaydir" > /dev/null 2>&1
 	umount -l "$rodir" > /dev/null 2>&1
 }
@@ -112,16 +112,7 @@ chrootstartx64 () {
 			break
 		fi
 	done
-	while : true ; do
-		if [[ ! -d sets ]] ; then
-			mkdir sets
-			mount -o bind sets "$overlaydir"/var/lib/portage
-			break
-		elif [[ -d sets ]] ; then
-			mount -o bind sets "$overlaydir"/var/lib/portage
-			break
-		fi
-	done
+	mount -o bind targets "$overlaydir"/mnt
 	mount -t proc proc "$overlaydir"/proc
 	mount -t sysfs sysfs "$overlaydir"/sys
 	mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$overlaydir"/dev
@@ -203,16 +194,7 @@ chrootstartx86 () {
 			break
 		fi
 	done
-	while : true ; do
-		if [[ ! -d sets ]] ; then
-			mkdir sets
-			mount -o bind sets "$overlaydir"/var/lib/portage
-			break
-		elif [[ -d sets ]] ; then
-			mount -o bind sets "$overlaydir"/var/lib/portage
-			break
-		fi
-	done
+	mount -o bind targets "$overlaydir"/mnt
 	mount -t proc proc "$overlaydir"/proc
 	mount -t sysfs sysfs "$overlaydir"/sys
 	mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$overlaydir"/dev
@@ -268,7 +250,8 @@ chrootx86 () {
 # x64 specific iso functions
 
 isostartx64 () {
-	mount -o bind sets "$isosyncdirx64"/var/lib/portage
+	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
@@ -284,7 +267,8 @@ isostopx64 () {
 	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"/var/lib/portage > /dev/null 2>&1
+	umount -l "$isosyncdirx64"/usr/portage/packages > /dev/null 2>&1
+	umount -l "$isosyncdirx64"/mnt > /dev/null 2>&1
 }
 
 isooverlaysx64 () {
@@ -323,7 +307,8 @@ isochrootx64 () {
 # x86 specific iso functions
 
 isostartx86 () {
-	mount -o bind sets "$isosyncdirx86"/var/lib/portage
+	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
@@ -339,7 +324,8 @@ isostopx86 () {
 	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"/var/lib/portage > /dev/null 2>&1
+	umount -l "$isosyncdirx86"/usr/portage/packages > /dev/null 2>&1
+	umount -l "$isosyncdirx86"/mnt > /dev/null 2>&1
 }
 
 isooverlaysx86 () {