Add default values for FETCHCOMMAND_SSH and RESUMECOMMAND_SSH

[portage.git] / cnf / make.globals

diff --git a/cnf/make.globals b/cnf/make.globals
index c16102ac774213d2469e922e8618a4fb004f2e56..d14d0519e592a1ac232655bc7ce92196bc0f5097 100644 (file)
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -43,8 +43,12 @@ RESUMECOMMAND="/usr/bin/wget -c -t 5 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FIL
 FETCHCOMMAND_RSYNC="rsync -avP \"\${URI}\" \"\${DISTDIR}/\${FILE}\""
 RESUMECOMMAND_RSYNC="rsync -avP \"\${URI}\" \"\${DISTDIR}/\${FILE}\""
 
+FETCHCOMMAND_SSH="bash -c \"x=\\\${2#ssh://} ; exec rsync -avP \\\"\\\${x%%/*}:/\\\${x#*/}\\\" \\\"\\\$1\\\"\" rsync \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
+RESUMECOMMAND_SSH=${FETCHCOMMAND_SSH}
+
 # Default user options
-FEATURES="assume-digests distlocks fixpackages fixlafiles news parallel-fetch protect-owned
+FEATURES="assume-digests binpkg-logs distlocks fixpackages
+          fixlafiles news parallel-fetch protect-owned
           sandbox sfperms strict unknown-features-warn unmerge-logs
           unmerge-orphans userfetch"
 
@@ -70,6 +74,8 @@ EMERGE_WARNING_DELAY="10"
 # This option will be removed and forced to yes.
 AUTOCLEAN="yes"
 
+PORTAGE_BZIP2_COMMAND="bzip2"
+
 # Don't compress files with these suffixes.
 PORTAGE_COMPRESS_EXCLUDE_SUFFIXES="css gif htm[l]? jp[e]?g js pdf png"