=================================================================== RCS file: /cvs/openbsd/fill_chroot/fill_chroot,v retrieving revision 1.7 retrieving revision 1.9 diff -u -r1.7 -r1.9 --- openbsd/fill_chroot/fill_chroot 2008/08/29 21:05:38 1.7 +++ openbsd/fill_chroot/fill_chroot 2008/09/13 00:07:59 1.9 @@ -1,5 +1,5 @@ #!/bin/sh -# $RedRiver: fill_chroot,v 1.6 2006/07/20 00:42:59 andrew Exp $ +# $RedRiver: fill_chroot,v 1.8 2008/09/03 21:37:21 andrew Exp $ CHROOT=${CHROOT:=/home/andrew/www} export CHROOT @@ -7,20 +7,29 @@ perl_to_chroot mkdir -p ${CHROOT}/usr/local/lib -if [ -e ${CHROOT}/bin/mini_sendmail ]; then - mkdir -p ${CHROOT}/usr/sbin - cd ${CHROOT}/usr/sbin - ln -sf ../../bin/mini_sendmail sendmail +if [ -e /usr/local/sbin/femail ]; then + mkdir -p ${CHROOT}/sbin + cp /usr/local/sbin/femail ${CHROOT}/sbin/ +fi + +if [ -e ${CHROOT}/sbin/femail ]; then + mkdir -p ${CHROOT}/usr/sbin/ + cd ${CHROOT}/usr/sbin/ + ln -sf ../../sbin/femail sendmail cd ${OLDPWD} else - echo mini_sendmail not installed! Please install it and link it to + echo femail not installed! Please install it and link it to echo " ${CHROOT}/usr/sbin/sendmail" fi if [ -e /usr/local/bin/aspell ]; then mkdir -p ${CHROOT}/usr/local/bin/ + mkdir -p ${CHROOT}/usr/local/share/ + mkdir -p ${CHROOT}/usr/local/lib/ cp /usr/local/bin/aspell ${CHROOT}/usr/local/bin/aspell - _find="${_find} -or -name aspell" + cp -r /usr/local/lib/aspell ${CHROOT}/usr/local/lib/ + cp -r /usr/local/share/aspell ${CHROOT}/usr/local/share/ + _find="${_find} -or ( -name aspell -a -type f )" fi find ${CHROOT}/usr -name *.so.* -or -name *.so ${_find} | xargs find_depends | \