X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=distrib%2Fgentoo%2Finitpre;h=4a66bf541de574d67a7d604888f8c3d690d64fd9;hb=909fa999c0180aba479959080bd434ad98930c49;hp=374c134e02c92aa61c339ad561c0b94edab7706b;hpb=5fa4aa6f4c09b0eba6db2b96f43017973a10544b;p=util-vserver.git diff --git a/distrib/gentoo/initpre b/distrib/gentoo/initpre index 374c134..4a66bf5 100755 --- a/distrib/gentoo/initpre +++ b/distrib/gentoo/initpre @@ -27,25 +27,28 @@ hash portageq &>/dev/null if test $? -eq 0; then _PORTDIR=$(portageq portdir) + _DISTDIR=$(portageq distdir) else _PORTDIR=/usr/portage + _DISTDIR=/usr/portage/distfiles fi if test -d $_PORTDIR; then ( echo echo "# shared portage tree" - echo "${_PORTDIR} /usr/portage none bind,ro 0 0" - echo "${_PORTDIR}/distfiles /usr/portage/distfiles none bind,rw 0 0" + echo "${_PORTDIR} /usr/portage none bind,ro 0 0" ) >> "$1"/fstab else echo "!!! Cannot find a portage tree! You should definitely use a" echo "!!! shared portage tree if you have multiple Gentoo guests!" fi - -# prevent dmesg errors/warnings -echo ">>> Enabling dummy /proc/kmsg" -echo syslog >> "$1"/ccapabilities +if test -d $_DISTDIR; then + echo "${_DISTDIR} /usr/portage/distfiles none bind,rw 0 0" >> "$1"/fstab +else + echo "!!! Cannot find distfiles directory! You should definitely use a" + echo "!!! shared distfiles directory if you have multiple Gentoo guests!" +fi # initstyle sanity