=== modified file 'functions/fsb_target_gentoo_base' --- functions/fsb_target_gentoo_base 2013-05-15 17:37:06 +0000 +++ functions/fsb_target_gentoo_base 2013-05-14 22:23:38 +0000 @@ -15,5 +15,4 @@ if (($+STAGE_GENTOO_PORTAGE22)); then echo '>$dir/etc/portage/package.keywords fsb_chroot_bash emerge -1 '>=sys-apps/portage-2.2.0_alpha1' || die - fsb_chroot_bash emerge -n libeatmydata fi === modified file 'template/chroot.sh' --- template/chroot.sh 2013-05-15 17:37:06 +0000 +++ template/chroot.sh 2013-05-14 19:21:38 +0000 @@ -10,36 +10,15 @@ NEW_ENV[PATH]="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" NEW_ENV[TERM]=$TERM # NEW_ENV[TERM]="${TERM%-256color}" -(($+MAKEOPTS)) && NEW_ENV[MAKEOPTS]=$MAKEOPTS -(($+FEATURES)) && NEW_ENV[FEATURES]=$FEATURES -(($+EMERGE_DEFAULT_OPTS)) && NEW_ENV[EMERGE_DEFAULT_OPTS]=$EMERGE_DEFAULT_OPTS do_chroot() { local -a call - - # reset environment call=( env -i - ) for key val in ${(kv)NEW_ENV}; do call+="$key=$val" done - - # linux32 or equivalent (($+SETARCH)) && call+=( setarch $SETARCH ) - - # the actual chroot call - call+=( chroot . ) - - if (($+EATMYDATA)); then - if [[ -x usr/bin/eatmydata ]]; then - call+=( /usr/bin/eatmydata ) - else - echo >&2 '/usr/bin/eatmydata not present!' - fi - fi - - # do it! - "${call[@]}" "$@" - + $call chroot . "$@" RET=$? echo "command $* returned $RET" } @@ -66,7 +45,7 @@ mkdir -v -p dev/{pts,shm} trymount -t devpts devpts dev/pts -trymount -t tmpfs -o gid=5,size=$TMPFS_SIZE tmpfs dev/shm +trymount -t tmpfs -o size=$TMPFS_SIZE tmpfs dev/shm trymount -t proc none proc