aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristos.K <freedomrfox@gmail.com>2017-06-03 06:40:17 +0300
committerChristos.K <freedomrfox@gmail.com>2017-06-03 06:40:17 +0300
commit01823173fed3c705d3e25f82d380f4e1ca1d2801 (patch)
tree6c6d0bb82fceaf1755f22a1e355c860284be1fa0 /scripts/functions/makeconf_ed
parentMinor changes (diff)
downloadGSE-01823173fed3c705d3e25f82d380f4e1ca1d2801.tar.gz
GSE-01823173fed3c705d3e25f82d380f4e1ca1d2801.tar.bz2
GSE-01823173fed3c705d3e25f82d380f4e1ca1d2801.zip
Stabilized sinit process for catalyst entry
Diffstat (limited to 'scripts/functions/makeconf_ed')
-rwxr-xr-xscripts/functions/makeconf_ed6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/functions/makeconf_ed b/scripts/functions/makeconf_ed
index ee10943..954e1f9 100755
--- a/scripts/functions/makeconf_ed
+++ b/scripts/functions/makeconf_ed
@@ -11,7 +11,6 @@ case ${SELCT:-9} in
[Yy][eE][sS]|[yY])
break ;;
[nN][oO]|[nN])
-export CORES="$(cat /proc/cpuinfo | grep processor | wc -l)"
echo "Starting automatic configuration..."
sleep 1
print_inf 1
@@ -36,11 +35,12 @@ DISTDIR="${PORTDIR}/distfiles"
PKGDIR="${PORTDIR}/packages"
# MAKE OPTS
EOF
-echo "MAKEOPTS="\"-j${CORES}\""">>"${CONFDIR}/system/portage/make.conf"
+MKCORES=$(( $(grep -c ^processor /proc/cpuinfo) + 1 ))
+echo "MAKEOPTS="\"-j${MKCORES}\""">>"${CONFDIR}/system/portage/make.conf"
echo "# EMERGE DEFAULT OPTS">>"${CONFDIR}/system/portage/make.conf"
echo "EMERGE_DEFAULT_OPTS="\"--load-average ${CORES}\""">>"${CONFDIR}/system/portage/make.conf"
echo "# MIRRORS">>"${CONFDIR}/system/portage/make.conf"
-
+unset MKCORES
echo "Determining optimal servers..."
GENMIRR="$(netselect -v -t2 -s10 ftp://ftp.swin.edu.au/gentoo http://ftp.swin.edu.au/gentoo http://gd.tuwien.ac.at/opsys/linux/gentoo/ ftp://gd.tuwien.ac.at/opsys/linux/gentoo/ \