fix eselect vi condition

jeanfrancisroy · Jul 11, 2011 · 671a570 · 671a570
1 parent 9c766ac
commit 671a570
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/targets/gentoo/stage1.spec b/targets/gentoo/stage1.spec
@@ -81,6 +81,9 @@ cat > /tmp/build.py << "EOF"
 $[[files/pythonjunk]]
 EOF
 
+# upgrade portage on stage3 if necessary, before we begin:
+emerge -u sys-apps/portage || die
+
 export buildpkgs="$(python /tmp/build.py)"
 export STAGE1_USE="$(portageq envvar STAGE1_USE)"
 export USE="-* bindist build xml ${STAGE1_USE}"

diff --git a/targets/gentoo/stage3.spec b/targets/gentoo/stage3.spec
@@ -45,7 +45,7 @@ do
 	rc-update add $service default
 done
 
-if [ "$[metro/build]" = "funtoo" ] || [ "$[metro/build]" = "~funtoo" ]
+if [ -e /usr/share/eselect/modules/vi.eselect ] && [ -e /bin/busybox ]
 then
 	eselect vi set busybox
 fi