X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.bin%2Fcustom-chroot;h=08d76ada03bfa4aedf7429ab16893cb924858bdd;hb=64b0a6dd26e21c1c3eac846738470edbe0350251;hp=93bca67df5e8cc72d969083af47fd3b8b0fad566;hpb=1b460979f8b0d8d88a4099ad3dcff98c9750c54e;p=home.git

diff --git a/.bin/custom-chroot b/.bin/custom-chroot
index 93bca67..08d76ad 100755
--- a/.bin/custom-chroot
+++ b/.bin/custom-chroot
@@ -115,7 +115,12 @@ usage() {
 main() {
 	bootstrap "$@"
 
-	local mounts=( proc sys tmp dev dev/shm run usr/portage usr/portage/distfiles usr/local/src )
+	local mounts=(
+		proc sys tmp dev dev/shm run
+		usr/portage usr/portage/distfiles
+		var/db/repos/gentoo var/cache/distfiles
+		usr/local/src
+	)
 
 	local chroot=${0%/*}
 	case ${chroot} in
@@ -147,8 +152,10 @@ main() {
 	done
 	# Handle special mounts that we don't want to just bind mount.
 	if ! is_mounted "${chroot}/dev/pts" ; then
+		# Option order matters: on older kernels that don't recognize newinstance,
+		# parsing stops as soon as it hits that.
 		mount -t devpts devpts "${chroot}/dev/pts" \
-			-o nosuid,noexec,newinstance,ptmxmode=0666,mode=0620,gid=5
+			-o nosuid,noexec,mode=0620,gid=5,ptmxmode=0666,newinstance
 	fi
 
 	init_chroot