add user mode tree at iso creation time

3 files changed, 12 insertions, 2 deletions

diff --git a/iso b/iso
index 462c67b..9f6ad94 100755
--- a/iso
+++ b/iso
@@ -43,6 +43,7 @@ prepareisox64 () {
 	chmod 755 ""$isoefibootdirx64"/bootx64.efi"
 	# configure portage && give up control for package / desktop environment installation
 	isostartx64
+	isousertreex64
 	isooverlaysx64
 	isobuildsystemx64
 	isochrootx64
diff --git a/libvasile-kogaion b/libvasile-kogaion
index d075bc8..4e93941 100755
--- a/libvasile-kogaion
+++ b/libvasile-kogaion
@@ -80,6 +80,7 @@ chrootstartx64 () {
 
 chrootdevtreex64 () {
 	echo "injecting full portage tree into build environment"
+	echo ""
 	sleep 1
 	chroot "$overlaydir" su - "$chrootuser" -c "$chrootdevtree"
 }
@@ -147,8 +148,15 @@ isostopx64 () {
 	umount -l "$isosyncdirx64"/usr/portage/packages > /dev/null 2>&1
 }
 
+isousertreex64 () {
+	echo "injecting minimal portage tree into environment (user mode)"
+	echo ""
+	sleep 1
+	chroot "$isosyncdirx64" su - "$isouser" -c "$isousertree"
+}
+
 isooverlaysx64 () {
-	echo "injecting "$releasename" "$releasetarget" overlay into x64 environment"
+	echo "injecting "$releasename" "$releasetarget" overlay into environment"
 	sleep 1
 	chroot "$isosyncdirx64" su - "$isouser" -c "$isomainoverlay"
 }
diff --git a/vasile-kogaion b/vasile-kogaion
index 9c6bf44..d462293 100755
--- a/vasile-kogaion
+++ b/vasile-kogaion
@@ -22,7 +22,7 @@ export local overlaydir="overlaydir"
 export local chrootuser="root"
 export local chroottarget="${@:2}"
 export local chrootbuildtarget="emerge -kav "$chroottarget""
-export local chroottree="/usr/share/vasile-kogaion/devmod"
+export local chrootdevtree="/usr/share/vasile-kogaion/devmod"
 export local chrootmainoverlay="layman -f -a "$releasename"-"$releasetarget" -o https://gitlab.com/"$releasename"/"$releasename"-"$releasetarget"/raw/master/overlay.xml"
 export local chrootbuildgit="cd /opt && git clone https://gitlab.com/"$releasename"/"$releasename"-build.git"
 export local chrootportageconfig="ln -sf /opt/"$releasename"-build/conf/intel/portage /etc/portage"
@@ -37,6 +37,7 @@ export local bootcorefiles="/tmp/bootcore/cdroot/boot"
 export local isouser="root"
 export local isotarget="${@:2}"
 export local isoinstalltarget="emerge -Kav "$isotarget""
+export local isousertree="/usr/share/vasile-kogaion/usermod"
 export local isomainoverlay="layman -f -a "$releasename"-"$releasetarget" -o https://gitlab.com/"$releasename"/"$releasename"-"$releasetarget"/raw/master/overlay.xml"
 export local isobuildgit="cd /opt && git clone https://gitlab.com/"$releasename"/"$releasename"-build.git"
 export local isoportageconfig="ln -sf /opt/"$releasename"-build/conf/intel/portage /etc/portage"